From ac2135560fcac13b08744388e24c498433ba5297 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 11 Nov 2016 14:11:19 +0100 Subject: [PATCH] Fix single author with details Signed-off-by: Joas Schilling --- settings/js/apps.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index 654756af53..451becc67a 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -189,6 +189,8 @@ OC.Settings.Apps = OC.Settings.Apps || { } }); app.author = authors.join(', '); + } else if (typeof app.author !== 'string') { + app.author = app.author['@value']; } var html = template(app); @@ -539,8 +541,8 @@ OC.Settings.Apps = OC.Settings.Apps || { // Author Name apps = apps.concat(_.filter(OC.Settings.Apps.State.apps, function (app) { + var authors = []; if (_.isArray(app.author)) { - var authors = []; _.each(app.author, function (author) { if (typeof author === 'string') { authors.push(author); @@ -555,6 +557,15 @@ OC.Settings.Apps = OC.Settings.Apps || { } }); 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); }));