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

Fix single author with details

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2016-11-11 14:11:19 +01:00
parent c53d7d59f7
commit ac2135560f
No known key found for this signature in database
GPG key ID: E166FD8976B3BAC8
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
settings/js/apps.js
View file

@ -189,6 +189,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
} }
}); });
app.author = authors.join(', '); app.author = authors.join(', ');
} else if (typeof app.author !== 'string') {
app.author = app.author['@value'];
} }
var html = template(app); var html = template(app);
@ -539,8 +541,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
// Author Name // Author Name
apps = apps.concat(_.filter(OC.Settings.Apps.State.apps, function (app) { apps = apps.concat(_.filter(OC.Settings.Apps.State.apps, function (app) {
var authors = [];
if (_.isArray(app.author)) { if (_.isArray(app.author)) {
var authors = [];
_.each(app.author, function (author) { _.each(app.author, function (author) {
if (typeof author === 'string') { if (typeof author === 'string') {
authors.push(author); authors.push(author);
@ -555,6 +557,15 @@ OC.Settings.Apps = OC.Settings.Apps || {
} }
}); });
return OC.Settings.Apps._search(authors.join(' '), query); return OC.Settings.Apps._search(authors.join(' '), query);
} else if (typeof app.author !== 'string') {
authors.push(app.author['@value']);
if (!_.isUndefined(app.author['@attributes']['homepage'])) {
authors.push(app.author['@attributes']['homepage']);
}
if (!_.isUndefined(app.author['@attributes']['mail'])) {
authors.push(app.author['@attributes']['mail']);
}
return OC.Settings.Apps._search(authors.join(' '), query);
} }
return OC.Settings.Apps._search(app.author, query); return OC.Settings.Apps._search(app.author, query);
})); }));