diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-10-24 08:50:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-24 08:50:12 -0400 |
commit | e6d26bee51067d65480925593d1610404ff9d5e3 (patch) | |
tree | de88b96d8345e9c1e411b4e299ab202388739be6 /webapp/components/admin_console/team_users.jsx | |
parent | 486d12e1c3a5d6658ca0ebd8fd28bec9f6753ce9 (diff) | |
download | chat-e6d26bee51067d65480925593d1610404ff9d5e3.tar.gz chat-e6d26bee51067d65480925593d1610404ff9d5e3.tar.bz2 chat-e6d26bee51067d65480925593d1610404ff9d5e3.zip |
Fixes for the team user lists in the system console (#4294)
Diffstat (limited to 'webapp/components/admin_console/team_users.jsx')
-rw-r--r-- | webapp/components/admin_console/team_users.jsx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/webapp/components/admin_console/team_users.jsx b/webapp/components/admin_console/team_users.jsx index 8fa73b084..1d0886737 100644 --- a/webapp/components/admin_console/team_users.jsx +++ b/webapp/components/admin_console/team_users.jsx @@ -11,7 +11,7 @@ import TeamStore from 'stores/team_store.jsx'; import UserStore from 'stores/user_store.jsx'; import {searchUsers, loadProfilesAndTeamMembers, loadTeamMembersForProfilesList} from 'actions/user_actions.jsx'; -import {getTeamStats} from 'utils/async_client.jsx'; +import {getTeamStats, getUser} from 'utils/async_client.jsx'; import Constants from 'utils/constants.jsx'; import * as Utils from 'utils/utils.jsx'; @@ -59,6 +59,7 @@ export default class UserList extends React.Component { componentDidMount() { AdminStore.addAllTeamsChangeListener(this.onAllTeamsChange); + UserStore.addChangeListener(this.onUsersChange); UserStore.addInTeamChangeListener(this.onUsersChange); TeamStore.addChangeListener(this.onTeamChange); TeamStore.addStatsChangeListener(this.onStatsChange); @@ -83,6 +84,7 @@ export default class UserList extends React.Component { componentWillUnmount() { AdminStore.removeAllTeamsChangeListener(this.onAllTeamsChange); + UserStore.removeChangeListener(this.onUsersChange); UserStore.removeInTeamChangeListener(this.onUsersChange); TeamStore.removeChangeListener(this.onTeamChange); TeamStore.removeStatsChangeListener(this.onStatsChange); @@ -129,8 +131,8 @@ export default class UserList extends React.Component { }); } - doPasswordResetSubmit() { - this.getCurrentTeamProfiles(); + doPasswordResetSubmit(user) { + getUser(user.id); this.setState({ showPasswordModal: false, user: null @@ -203,6 +205,7 @@ export default class UserList extends React.Component { } if (mfaEnabled) { + info.push(', '); if (user.mfa_active) { info.push( <FormattedHTMLMessage @@ -252,7 +255,6 @@ export default class UserList extends React.Component { search={this.search} actions={[AdminTeamMembersDropdown]} actionProps={{ - refreshProfiles: this.getCurrentTeamProfiles, doPasswordReset: this.doPasswordReset }} actionUserProps={actionUserProps} |