diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-11-02 14:38:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 14:38:34 -0400 |
commit | 137ade29d061e158543da814ecd0d06d7e992c1f (patch) | |
tree | cb528f2db486f78a4e9fe5a75a693ce6d3968cca /webapp/stores/user_store.jsx | |
parent | b45cc443c9e9fdf8147d354b95b6fecb31b2e7b2 (diff) | |
download | chat-137ade29d061e158543da814ecd0d06d7e992c1f.tar.gz chat-137ade29d061e158543da814ecd0d06d7e992c1f.tar.bz2 chat-137ade29d061e158543da814ecd0d06d7e992c1f.zip |
PLT-4535/PLT-4503 Fix inactive users in searches and add option functionality to DB user search (#4413)
* Add options to user database search
* Fix inactive users showing up incorrectly in some user searches
* Read JSON for searchUsers API into anonymous struct
* Move anonymous struct to be a normal struct in model directory and upadte client to use it
* Added clarification comment about slightly odd query condition in search
Diffstat (limited to 'webapp/stores/user_store.jsx')
-rw-r--r-- | webapp/stores/user_store.jsx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx index 9ac8540f9..bb3415a7d 100644 --- a/webapp/stores/user_store.jsx +++ b/webapp/stores/user_store.jsx @@ -312,7 +312,7 @@ class UserStoreClass extends EventEmitter { this.saveProfiles(profiles); } - getProfileListInTeam(teamId = TeamStore.getCurrentId(), skipCurrent) { + getProfileListInTeam(teamId = TeamStore.getCurrentId(), skipCurrent = false, skipInactive = false) { const userIds = this.profiles_in_team[teamId] || []; const profiles = []; const currentId = this.getCurrentId(); @@ -324,6 +324,10 @@ class UserStoreClass extends EventEmitter { continue; } + if (skipInactive && profile.delete_at > 0) { + continue; + } + if (profile) { profiles.push(profile); } |