Added support for mixed arrays of authors with or without extra info

settings/js/admin-apps.js

@@ -157,13 +157,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			app.previewAsIcon = true;
 		}
 
-		if (_.isArray(app.author)) {
-			app.author = app.author.join(', ');
-		}
-
-		if (_.isObject(app.author) && !_.isUndefined(app.author['@value'])) {
-			app.author = app.author['@value'];
-		}
+		app.author = this._parseAppAuthor(app.author);
 
 		var html = template(app);
 		if (selector) {
@@ -208,7 +202,33 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		}
 	},
 
-	isType: function(app, type){
+	/**
+	 * Parses the author(s) from the app info response.
+	 *
+	 * @param {(string|string[]|Object|Object[])} author - A string or an array of Objects or strings or both representing the author info from apps info.xml.
+	 * @return {string}
+	 */
+	_parseAppAuthor: function (author) {
+		if (_.isObject(author) && !_.isUndefined(author['@value'])) {
+			return author['@value'];
+		}
+
+		if (_.isArray(author)) {
+			var authorNames = [];
+			for (var i = 0; i < author.length; i++) {
+				if (_.isObject(author[i]) && !_.isUndefined(author[i]['@value'])) {
+					authorNames.push(author[i]['@value']);
+				} else {
+					authorNames.push(author[i]);
+				}
+			}
+			return authorNames.join(', ');
+		}
+
+		return author;
+	},
+
+	isType: function(app, type) {
 		return app.types && app.types.indexOf(type) !== -1;
 	},
 
@@ -492,13 +512,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			if (_.isUndefined(app.author)) {
 				return false;
 			}
-			if (_.isArray(app.author)) {
-				return app.author.join(' ').toLowerCase().indexOf(query) !== -1;
-			}
-			if (_.isObject(app.author) && !_.isUndefined(app.author['@value'])) {
-				return app.author['@value'].toLowerCase().indexOf(query) !== -1;
-			}
-			return app.author.toLowerCase().indexOf(query) !== -1;
+			return self._parseAppAuthor(app.author).toLowerCase().indexOf(query) !== -1;
 		}));
 
 		// App status