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/channel_header.jsx | |
| 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/channel_header.jsx')
| -rw-r--r-- | webapp/components/channel_header.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index 7116b435c..a409baec6 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -73,7 +73,7 @@ export default class ChannelHeader extends React.Component { getStateFromStores() { const channel = ChannelStore.get(this.props.channelId); const stats = ChannelStore.getStats(this.props.channelId); - const users = UserStore.getProfileListInChannel(this.props.channelId); + const users = UserStore.getProfileListInChannel(this.props.channelId, false, true); let otherUserId = null; if (channel && channel.type === 'D') { @@ -227,7 +227,7 @@ export default class ChannelHeader extends React.Component { AppDispatcher.handleViewAction({ type: ActionTypes.TOGGLE_DM_MODAL, value: true, - startingUsers: UserStore.getProfileListInChannel(this.props.channelId, true) + startingUsers: UserStore.getProfileListInChannel(this.props.channelId, true, false) }); } |