diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-08-28 15:42:06 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-08-28 15:42:06 -0700 |
| commit | af6eb9d41b3e888fcc0f4aa4a832dc6e5a5065f9 (patch) | |
| tree | 897e92e70c7c67fbc41c52e5e105b6352308d7d6 | |
| parent | 81cab5ada84bfbb0fb38b8b031770f29bc4ceda6 (diff) | |
| parent | 1d04843ef07abe16132badc4d062a1321a18d211 (diff) | |
| download | nextcloud-server-af6eb9d41b3e888fcc0f4aa4a832dc6e5a5065f9.tar.gz nextcloud-server-af6eb9d41b3e888fcc0f4aa4a832dc6e5a5065f9.zip | |
Merge pull request #4631 from owncloud/hotfix_4630
Work around #4630 to fix license showing
| -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(); |