diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-12-15 09:51:56 -0500 |
---|---|---|
committer | enahum <nahumhbl@gmail.com> | 2016-12-15 11:51:56 -0300 |
commit | c35b95709e293680f882f27ab6e616bf8f92a7cc (patch) | |
tree | 456adae7bd20257e5eba2f0f78589ae8d2cde683 | |
parent | d88b4ef888c25df05e2f7c6ca5cd73da15cf7fe9 (diff) | |
download | chat-c35b95709e293680f882f27ab6e616bf8f92a7cc.tar.gz chat-c35b95709e293680f882f27ab6e616bf8f92a7cc.tar.bz2 chat-c35b95709e293680f882f27ab6e616bf8f92a7cc.zip |
Allow any user in a channel to remove other users (#4806)
-rw-r--r-- | webapp/components/channel_header.jsx | 53 | ||||
-rw-r--r-- | webapp/components/channel_members_modal.jsx | 10 |
2 files changed, 18 insertions, 45 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index 36bcb559a..addd147fd 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -474,43 +474,23 @@ export default class ChannelHeader extends React.Component { </li> ); - if (isAdmin) { - dropdownContents.push( - <li - key='manage_members' - role='presentation' - > - <a - role='menuitem' - href='#' - onClick={() => this.setState({showMembersModal: true})} - > - <FormattedMessage - id='channel_header.manageMembers' - defaultMessage='Manage Members' - /> - </a> - </li> - ); - } else { - dropdownContents.push( - <li - key='view_members' - role='presentation' + dropdownContents.push( + <li + key='manage_members' + role='presentation' + > + <a + role='menuitem' + href='#' + onClick={() => this.setState({showMembersModal: true})} > - <a - role='menuitem' - href='#' - onClick={() => this.setState({showMembersModal: true})} - > - <FormattedMessage - id='channel_header.viewMembers' - defaultMessage='View Members' - /> - </a> - </li> - ); - } + <FormattedMessage + id='channel_header.manageMembers' + defaultMessage='Manage Members' + /> + </a> + </li> + ); } dropdownContents.push( @@ -687,7 +667,6 @@ export default class ChannelHeader extends React.Component { onModalDismissed={() => this.setState({showMembersModal: false})} showInviteModal={() => this.refs.channelInviteModalButton.show()} channel={channel} - isAdmin={isAdmin} /> ); } diff --git a/webapp/components/channel_members_modal.jsx b/webapp/components/channel_members_modal.jsx index b5ca024f2..3722195b9 100644 --- a/webapp/components/channel_members_modal.jsx +++ b/webapp/components/channel_members_modal.jsx @@ -143,11 +143,6 @@ export default class ChannelMembersModal extends React.Component { if (this.state.loading) { content = (<LoadingScreen/>); } else { - let removeButton = null; - if (this.props.isAdmin) { - removeButton = [this.createRemoveMemberButton]; - } - content = ( <SearchableUserList users={this.state.users} @@ -155,7 +150,7 @@ export default class ChannelMembersModal extends React.Component { total={this.state.total} nextPage={this.nextPage} search={this.search} - actions={removeButton} + actions={[this.createRemoveMemberButton]} focusOnMount={!UserAgent.isMobile()} /> ); @@ -205,6 +200,5 @@ export default class ChannelMembersModal extends React.Component { ChannelMembersModal.propTypes = { onModalDismissed: React.PropTypes.func.isRequired, showInviteModal: React.PropTypes.func.isRequired, - channel: React.PropTypes.object.isRequired, - isAdmin: React.PropTypes.bool.isRequired + channel: React.PropTypes.object.isRequired }; |