From 137ade29d061e158543da814ecd0d06d7e992c1f Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Wed, 2 Nov 2016 14:38:34 -0400 Subject: 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 --- webapp/components/admin_console/team_users.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'webapp/components/admin_console/team_users.jsx') 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); -- cgit v1.2.3-1-g7c22