wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4631 from owncloud/hotfix_4630

Browse source 
Work around #4630 to fix license showing
This commit is contained in:
Morris Jobke 2013-08-28 15:42:06 -07:00
commit af6eb9d41b
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
settings/js/apps.js
View file

@ -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();