From 6c7efd5dacaf9144b715ad6db408ce53d0682cbe Mon Sep 17 00:00:00 2001 From: kondou Date: Wed, 28 Aug 2013 22:12:01 +0200 Subject: Work around #4630 to fix license showing --- settings/js/apps.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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(); -- cgit v1.2.3 From 1d04843ef07abe16132badc4d062a1321a18d211 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Wed, 28 Aug 2013 22:42:43 +0200 Subject: no duplicate declaration of appLicense + camelCase --- settings/js/apps.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index 3372d769bd3..1ae45932172 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -29,14 +29,13 @@ OC.Settings.Apps = OC.Settings.Apps || { page.find('span.author').text(app.author); // FIXME licenses of downloaded apps go into app.licence, licenses of not-downloaded apps into app.license + var appLicense = ''; if (typeof(app.licence) !== 'undefined') { - var applicense = app.licence; + appLicense = app.licence; } else if (typeof(app.license) !== 'undefined') { - var applicense = app.license; - } else { - var applicense = ''; + appLicense = app.license; } - page.find('span.licence').text(applicense); + page.find('span.licence').text(appLicense); if (app.update !== false) { page.find('input.update').show(); -- cgit v1.2.3