IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Admin group search was failing

Browse Source
This commit is contained in:
Robin Ward
2014-08-18 14:08:21 -04:00
parent 629bfb73f5
commit b175abbfb5
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/assets/javascripts/discourse/lib/user-search.js.es6
View File

@@ -37,22 +37,26 @@ function organizeResults(r, options) {
groups = [], groups = [],
results = []; results = [];
r.users.every(function(u) { if (r.users) {
if (exclude.indexOf(u.username) === -1) { r.users.every(function(u) {
users.push(u); if (exclude.indexOf(u.username) === -1) {
results.push(u); users.push(u);
} results.push(u);
return results.length <= limit; }
}); return results.length <= limit;
});
}
r.groups.every(function(g) { if (r.groups) {
if (results.length > limit) return false; r.groups.every(function(g) {
if (exclude.indexOf(g.name) === -1) { if (results.length > limit) return false;
groups.push(g); if (exclude.indexOf(g.name) === -1) {
results.push(g); groups.push(g);
} results.push(g);
return true; }
}); return true;
});
}
results.users = users; results.users = users;
results.groups = groups; results.groups = groups;