github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 13:56:50 +08:00
Code Issues Actions 1 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
Show Stats 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 = [],
results = [];
r.users.every(function(u) {
if (exclude.indexOf(u.username) === -1) {
users.push(u);
results.push(u);
}
return results.length <= limit;
});
if (r.users) {
r.users.every(function(u) {
if (exclude.indexOf(u.username) === -1) {
users.push(u);
results.push(u);
}
return results.length <= limit;
});
}
r.groups.every(function(g) {
if (results.length > limit) return false;
if (exclude.indexOf(g.name) === -1) {
groups.push(g);
results.push(g);
}
return true;
});
if (r.groups) {
r.groups.every(function(g) {
if (results.length > limit) return false;
if (exclude.indexOf(g.name) === -1) {
groups.push(g);
results.push(g);
}
return true;
});
}
results.users = users;
results.groups = groups;