summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2015-01-06 18:37:32 +0100
committerRobin Appelman <robin@icewind.nl>2015-01-06 18:37:32 +0100
commitc740f4a4e429561a14a1026ea22c69e9ace1ea18 (patch)
treed15c166bc830e433689a45a2c014d1d8f5553b1c
parent7528a1a47503e1ced9b5753a38f3624d7059f8d6 (diff)
parentb2124d8d4fca04281ff44ff53564bcc578fe65fc (diff)
downloadnextcloud-server-c740f4a4e429561a14a1026ea22c69e9ace1ea18.tar.gz
nextcloud-server-c740f4a4e429561a14a1026ea22c69e9ace1ea18.zip
Merge pull request #13129 from owncloud/group-select-fix-autocomplete
Fix group select autocomplete
-rw-r--r--settings/js/settings.js28
1 files changed, 12 insertions, 16 deletions
diff --git a/settings/js/settings.js b/settings/js/settings.js
index e98bd2cc895..fcbe328b76f 100644
--- a/settings/js/settings.js
+++ b/settings/js/settings.js
@@ -45,25 +45,21 @@ OC.Settings = _.extend(OC.Settings, {
data: queryData,
dataType: 'json',
success: function(data) {
- if (data.status === "success") {
- var results = [];
+ var results = [];
- // add groups
- $.each(data.data.adminGroups, function(i, group) {
- results.push({id:group.id, displayname:group.name});
- });
- $.each(data.data.groups, function(i, group) {
- results.push({id:group.id, displayname:group.name});
- });
+ // add groups
+ $.each(data.data.adminGroups, function(i, group) {
+ results.push({id:group.id, displayname:group.name});
+ });
+ $.each(data.data.groups, function(i, group) {
+ results.push({id:group.id, displayname:group.name});
+ });
- if (query.term === '') {
- // cache full list
- self._cachedGroups = results;
- }
- query.callback({results: results});
- } else {
- //FIXME add error handling
+ if (query.term === '') {
+ // cache full list
+ self._cachedGroups = results;
}
+ query.callback({results: results});
}
});
}, 100, true),