summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-28 22:12:01 +0200
committerkondou <kondou@ts.unde.re>2013-08-28 22:12:01 +0200
commit6c7efd5dacaf9144b715ad6db408ce53d0682cbe (patch)
treecdcb787b5f78ba38a3fc1dcd5a6c9efc27e90537 /settings
parent584857de696e0035abb561b569588af406d818d7 (diff)
downloadnextcloud-server-6c7efd5dacaf9144b715ad6db408ce53d0682cbe.tar.gz
nextcloud-server-6c7efd5dacaf9144b715ad6db408ce53d0682cbe.zip
Work around #4630 to fix license showing
Diffstat (limited to 'settings')
-rw-r--r--settings/js/apps.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index d9817aff6b6..3372d769bd3 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -27,7 +27,16 @@ 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
+ if (typeof(app.licence) !== 'undefined') {
+ var applicense = app.licence;
+ } else if (typeof(app.license) !== 'undefined') {
+ var applicense = app.license;
+ } else {
+ var applicense = '';
+ }
+ page.find('span.licence').text(applicense);
if (app.update !== false) {
page.find('input.update').show();