diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-04-28 10:12:30 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-04-28 10:12:30 -0400 |
| commit | 83bfd95f65f5e74402f7146feecb68b37dd0bf84 (patch) | |
| tree | 4bd26edcf6813af414d2572ed7181dd129066965 /webapp | |
| parent | 224ddb35cf7ac804883f2ef0c9e4f5ab83dde6bc (diff) | |
| download | chat-83bfd95f65f5e74402f7146feecb68b37dd0bf84.tar.gz chat-83bfd95f65f5e74402f7146feecb68b37dd0bf84.tar.bz2 chat-83bfd95f65f5e74402f7146feecb68b37dd0bf84.zip | |
Fix inactive users showing up in team members modal (#6260)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/actions/user_actions.jsx | 5 | ||||
| -rw-r--r-- | webapp/components/member_list_team/member_list_team.jsx | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx index f6c9e0f60..eacb0df80 100644 --- a/webapp/actions/user_actions.jsx +++ b/webapp/actions/user_actions.jsx @@ -629,10 +629,7 @@ export function checkMfa(loginId, success, error) { export function updateActive(userId, active, success, error) { Client.updateActive(userId, active, (data) => { - AppDispatcher.handleServerAction({ - type: ActionTypes.RECEIVED_PROFILE, - profile: data - }); + UserStore.saveProfile(data); if (success) { success(data); diff --git a/webapp/components/member_list_team/member_list_team.jsx b/webapp/components/member_list_team/member_list_team.jsx index 40d65c7f1..bce6ade1b 100644 --- a/webapp/components/member_list_team/member_list_team.jsx +++ b/webapp/components/member_list_team/member_list_team.jsx @@ -44,7 +44,7 @@ export default class MemberListTeam extends React.Component { this.state = { users: UserStore.getProfileListInTeam(), teamMembers: Object.assign([], TeamStore.getMembersInTeam()), - total: stats.total_member_count, + total: stats.active_member_count, loading: true }; } @@ -83,7 +83,7 @@ export default class MemberListTeam extends React.Component { onStatsChange() { const stats = TeamStore.getCurrentStats(); - this.setState({total: stats.total_member_count}); + this.setState({total: stats.active_member_count}); } nextPage(page) { @@ -141,7 +141,7 @@ export default class MemberListTeam extends React.Component { for (let i = 0; i < users.length; i++) { const user = users[i]; - if (teamMembers[user.id]) { + if (teamMembers[user.id] && user.delete_at === 0) { usersToDisplay.push(user); actionUserProps[user.id] = { teamMember: teamMembers[user.id] |