summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-03-09 04:15:38 -0500
committerGeorge Goldberg <george@gberg.me>2017-03-09 09:15:38 +0000
commitcbead2d973fb70bf4dc644dd6a8b8c34b49ff6aa (patch)
treef98d9b9a0b6aad63708fc045c01d709bf375a3a9 /webapp/components/admin_console
parentbfc8dafe5eb03d6e4daa8fbc42f8361674474479 (diff)
downloadchat-cbead2d973fb70bf4dc644dd6a8b8c34b49ff6aa.tar.gz
chat-cbead2d973fb70bf4dc644dd6a8b8c34b49ff6aa.tar.bz2
chat-cbead2d973fb70bf4dc644dd6a8b8c34b49ff6aa.zip
Remove race between clearing lists and search requests (#5686)
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/team_users.jsx5
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/admin_console/team_users.jsx b/webapp/components/admin_console/team_users.jsx
index 0874e4c8c..5bdaedf6e 100644
--- a/webapp/components/admin_console/team_users.jsx
+++ b/webapp/components/admin_console/team_users.jsx
@@ -148,16 +148,17 @@ export default class UserList extends React.Component {
}
search(term) {
+ clearTimeout(this.searchTimeoutId);
+
if (term === '') {
this.setState({search: false, users: UserStore.getProfileListInTeam(this.props.params.team)});
+ this.searchTimeoutId = '';
return;
}
const options = {};
options[UserSearchOptions.ALLOW_INACTIVE] = true;
- clearTimeout(this.searchTimeoutId);
-
const searchTimeoutId = setTimeout(
() => {
searchUsers(