LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Improve User.$filter

pull/110/head
Francis Lachapelle 2015-10-08 10:04:25 -04:00
parent 58afdedcc1
commit 2ad02b8386
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UI/WebServerResources/js/Common/User.service.js
View File

@ -44,12 +44,11 @@
* @return a promise of an array of matching User objects
*/
User.$filter = function(search, excludedUsers) {
var param = {search: search};
var _this = this;
var _this = this, param = {search: search};
if (!search) {
// No query specified
User.$users = [];
User.$users.splice(0, User.$users.length);
return User.$q.when(User.$users);
}
if (User.$query == search) {
@ -61,17 +60,18 @@
return User.$$resource.fetch(null, 'usersSearch', param).then(function(response) {
var results, index, user,
compareUids = function(data) {
return _this.uid == data.uid;
return this.uid == data.uid;
};
if (excludedUsers) {
// Remove excluded users from response
results = _.filter(response.users, function(data) {
results = _.filter(response.users, function(user) {
return !_.find(excludedUsers, compareUids, user);
});
}
else {
results = response.users;
}
// Remove users that no longer match the search query
for (index = User.$users.length - 1; index >= 0; index--) {
user = User.$users[index];