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/components/more_direct_channels.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/components/more_direct_channels.jsx')
| -rw-r--r-- | webapp/components/more_direct_channels.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/components/more_direct_channels.jsx b/webapp/components/more_direct_channels.jsx index 52e546cd2..7e57261b6 100644 --- a/webapp/components/more_direct_channels.jsx +++ b/webapp/components/more_direct_channels.jsx @@ -37,7 +37,7 @@ export default class MoreDirectChannels extends React.Component { this.loadComplete = this.loadComplete.bind(this); this.state = { - users: UserStore.getProfileListInTeam(TeamStore.getCurrentId(), true), + users: UserStore.getProfileListInTeam(TeamStore.getCurrentId(), true, true), loadingDMChannel: -1, listType: 'team', loading: false, @@ -111,7 +111,7 @@ export default class MoreDirectChannels extends React.Component { if (this.state.listType === 'any') { users = UserStore.getProfileList(); } else { - users = UserStore.getProfileListInTeam(TeamStore.getCurrentId(), true); + users = UserStore.getProfileListInTeam(TeamStore.getCurrentId(), true, true); } this.setState({ @@ -125,7 +125,7 @@ export default class MoreDirectChannels extends React.Component { if (listType === 'any') { users = UserStore.getProfileList(); } else { - users = UserStore.getProfileListInTeam(TeamStore.getCurrentId(), true); + users = UserStore.getProfileListInTeam(TeamStore.getCurrentId(), true, true); } this.setState({ |