]> source.dussan.org Git - nextcloud-server.git/commitdiff
Work around #4630 to fix license showing
authorkondou <kondou@ts.unde.re>
Wed, 28 Aug 2013 20:12:01 +0000 (22:12 +0200)
committerkondou <kondou@ts.unde.re>
Wed, 28 Aug 2013 20:12:01 +0000 (22:12 +0200)
settings/js/apps.js

index d9817aff6b6791e3376a91d642c6508d749b5907..3372d769bd321f8f265e793105249b35a6d2f8c9 100644 (file)
@@ -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();