summaryrefslogtreecommitdiffstats
path: root/webapp/components/channel_invite_modal
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-07-18 06:27:29 +0800
committerGitHub <noreply@github.com>2017-07-18 06:27:29 +0800
commit41969ae66c2d140b004e6dbced597749f34aedf8 (patch)
treeea4fc4e53ec9c356e6a7031f516ca13b667b94b2 /webapp/components/channel_invite_modal
parent3e090162aaac7cbc75900635b800d96e9e9050e3 (diff)
downloadchat-41969ae66c2d140b004e6dbced597749f34aedf8.tar.gz
chat-41969ae66c2d140b004e6dbced597749f34aedf8.tar.bz2
chat-41969ae66c2d140b004e6dbced597749f34aedf8.zip
[PLT-7141] Fix deactivated user from appearing in channel view members list filtering (#6957)
* fix deactivated user from appearing in channel view members list filtering * add deactivated user filters to channels, teams and DM
Diffstat (limited to 'webapp/components/channel_invite_modal')
-rw-r--r--webapp/components/channel_invite_modal/channel_invite_modal.jsx7
1 files changed, 6 insertions, 1 deletions
diff --git a/webapp/components/channel_invite_modal/channel_invite_modal.jsx b/webapp/components/channel_invite_modal/channel_invite_modal.jsx
index d2fceb2c3..8b09a7496 100644
--- a/webapp/components/channel_invite_modal/channel_invite_modal.jsx
+++ b/webapp/components/channel_invite_modal/channel_invite_modal.jsx
@@ -143,13 +143,18 @@ export default class ChannelInviteModal extends React.Component {
inviteError = (<label className='has-error control-label'>{this.state.inviteError}</label>);
}
+ let users = [];
+ if (this.state.users) {
+ users = this.state.users.filter((user) => user.delete_at === 0);
+ }
+
let content;
if (this.state.loading) {
content = (<LoadingScreen/>);
} else {
content = (
<SearchableUserList
- users={this.state.users}
+ users={users}
usersPerPage={USERS_PER_PAGE}
total={this.state.total}
nextPage={this.nextPage}