summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/team_users.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-11-02 14:38:34 -0400
committerGitHub <noreply@github.com>2016-11-02 14:38:34 -0400
commit137ade29d061e158543da814ecd0d06d7e992c1f (patch)
treecb528f2db486f78a4e9fe5a75a693ce6d3968cca /webapp/components/admin_console/team_users.jsx
parentb45cc443c9e9fdf8147d354b95b6fecb31b2e7b2 (diff)
downloadchat-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/admin_console/team_users.jsx')
-rw-r--r--webapp/components/admin_console/team_users.jsx7
1 files changed, 5 insertions, 2 deletions
diff --git a/webapp/components/admin_console/team_users.jsx b/webapp/components/admin_console/team_users.jsx
index 1d0886737..3efb242ed 100644
--- a/webapp/components/admin_console/team_users.jsx
+++ b/webapp/components/admin_console/team_users.jsx
@@ -13,7 +13,7 @@ import UserStore from 'stores/user_store.jsx';
import {searchUsers, loadProfilesAndTeamMembers, loadTeamMembersForProfilesList} from 'actions/user_actions.jsx';
import {getTeamStats, getUser} from 'utils/async_client.jsx';
-import Constants from 'utils/constants.jsx';
+import {Constants, UserSearchOptions} from 'utils/constants.jsx';
import * as Utils from 'utils/utils.jsx';
import React from 'react';
@@ -145,10 +145,13 @@ export default class UserList extends React.Component {
return;
}
+ const options = {};
+ options[UserSearchOptions.ALLOW_INACTIVE] = true;
+
searchUsers(
term,
this.props.params.team,
- {},
+ options,
(users) => {
this.setState({loading: true, search: true, users});
loadTeamMembersForProfilesList(users, this.props.params.team, this.loadComplete);