diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2016-10-05 19:06:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-05 19:06:22 +0200 |
commit | da0d0d82c894b0073bc124d384acde0ce392bccc (patch) | |
tree | bbad15662dace425faa6e0b341aa4672a41c7bcd /settings/js/apps.js | |
parent | 815616fb2c570b6923124b9af1292f682f398b28 (diff) | |
parent | 53ed3da05250672817e6bfaccfc3551e9a14288e (diff) | |
download | nextcloud-server-da0d0d82c894b0073bc124d384acde0ce392bccc.tar.gz nextcloud-server-da0d0d82c894b0073bc124d384acde0ce392bccc.zip |
Merge pull request #1586 from nextcloud/issue-1466-fix-multi-translation-names-and-descriptions
Allow multiple names and description
Diffstat (limited to 'settings/js/apps.js')
-rw-r--r-- | settings/js/apps.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index 99246f323fe..5119b35178e 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -183,6 +183,10 @@ OC.Settings.Apps = OC.Settings.Apps || { app.previewAsIcon = true; } + if (_.isArray(app.author)) { + app.author = app.author.join(', '); + } + var html = template(app); if (selector) { selector.html(html); @@ -513,6 +517,9 @@ 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; + } return app.author.toLowerCase().indexOf(query) !== -1; })); |