diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-31 12:56:36 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-31 12:56:36 +0200 |
| commit | 5d653753bd8f6f1294dfbfa112757e5509ddc80d (patch) | |
| tree | 54853c3cf28f4d3ec58d7f9230be68e8e70d4998 /settings/js | |
| parent | 30526ded803e352f3f7322ed96ebc480d5e3f9c1 (diff) | |
| parent | 92e90c8eb995c886b3e9cd77c14e3f0b25b95cd7 (diff) | |
| download | nextcloud-server-5d653753bd8f6f1294dfbfa112757e5509ddc80d.tar.gz nextcloud-server-5d653753bd8f6f1294dfbfa112757e5509ddc80d.zip | |
Merge branch 'master' into oc_avatars
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/apps.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index d9817aff6b6..1ae45932172 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -27,7 +27,15 @@ OC.Settings.Apps = OC.Settings.Apps || { } page.find('small.externalapp').attr('style', 'visibility:visible'); page.find('span.author').text(app.author); - page.find('span.licence').text(app.license); + + // FIXME licenses of downloaded apps go into app.licence, licenses of not-downloaded apps into app.license + var appLicense = ''; + if (typeof(app.licence) !== 'undefined') { + appLicense = app.licence; + } else if (typeof(app.license) !== 'undefined') { + appLicense = app.license; + } + page.find('span.licence').text(appLicense); if (app.update !== false) { page.find('input.update').show(); |