Fix authors that have a mail or homepage

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 5119b35178eeeee77aca8cb9b5a9500d434b4443..cd554812ec9d5a92b8fa5711b5a0263946e37c66 100644 (file)
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -184,7 +184,15 @@ OC.Settings.Apps = OC.Settings.Apps || {
                }
 
                if (_.isArray(app.author)) {
-                       app.author = app.author.join(', ');
+                       var authors = [];
+                       _.each(app.author, function (author) {
+                               if (typeof author === 'string') {
+                                       authors.push(author);
+                               } else {
+                                       authors.push(author['@value']);
+                               }
+                       });
+                       app.author = authors.join(', ');
                }
 
                var html = template(app);
@@ -518,7 +526,21 @@ OC.Settings.Apps = OC.Settings.Apps || {
                // Author Name
                apps = apps.concat(_.filter(OC.Settings.Apps.State.apps, function (app) {
                        if (_.isArray(app.author)) {
-                               return app.author.join(', ').toLowerCase().indexOf(query) !== -1;
+                               var authors = [];
+                               _.each(app.author, function (author) {
+                                       if (typeof author === 'string') {
+                                               authors.push(author);
+                                       } else {
+                                               authors.push(author['@value']);
+                                               if (!_.isUndefined(author['@attributes']['homepage'])) {
+                                                       authors.push(author['@attributes']['homepage']);
+                                               }
+                                               if (!_.isUndefined(author['@attributes']['mail'])) {
+                                                       authors.push(author['@attributes']['mail']);
+                                               }
+                                       }
+                               });
+                               return authors.join(' ').toLowerCase().indexOf(query) !== -1;
                        }
                        return app.author.toLowerCase().indexOf(query) !== -1;
                }));