diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-22 06:36:46 -0400 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-06-22 11:36:46 +0100 |
commit | 3f1fca9463df27e8f795356ab6873d0d5bf4d634 (patch) | |
tree | eb023486f6bac6a8156633fcc6adb5f4bd360583 /webapp/components/member_list_channel | |
parent | ac4e9909fa4f3f6c6a0d1e537d6039115d07a5e0 (diff) | |
download | chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.tar.gz chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.tar.bz2 chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.zip |
PLT-6759 Show deactivated users in GMs (#6703)
* Show deactivated users in GMs
* Fix runtime error when DMing deactivated user
Diffstat (limited to 'webapp/components/member_list_channel')
-rw-r--r-- | webapp/components/member_list_channel/member_list_channel.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/member_list_channel/member_list_channel.jsx b/webapp/components/member_list_channel/member_list_channel.jsx index 8dbdd37f2..f33d14a27 100644 --- a/webapp/components/member_list_channel/member_list_channel.jsx +++ b/webapp/components/member_list_channel/member_list_channel.jsx @@ -45,7 +45,7 @@ export default class MemberListChannel extends React.Component { const stats = ChannelStore.getCurrentStats(); this.state = { - users: UserStore.getProfileListInChannel(), + users: UserStore.getProfileListInChannel(ChannelStore.getCurrentId(), false, true), teamMembers: Object.assign({}, TeamStore.getMembersInTeam()), channelMembers: Object.assign({}, ChannelStore.getMembersInChannel()), total: stats.member_count, @@ -81,7 +81,7 @@ export default class MemberListChannel extends React.Component { if (this.term) { users = searchProfilesInCurrentChannel(store.getState(), this.term); } else { - users = UserStore.getProfileListInChannel(); + users = UserStore.getProfileListInChannel(ChannelStore.getCurrentId(), false, true); } this.setState({ |