diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-07-04 04:06:18 -0400 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-07-04 09:06:18 +0100 |
commit | 9f5fb98b751d33d13c5fa2242054f829f5eb8be0 (patch) | |
tree | a60bbc3921350084f0726e22013ce960bdbd3dc5 /webapp/components/channel_members_dropdown | |
parent | 7a09b4bd783495e705f1a590a70d5729ce447356 (diff) | |
download | chat-9f5fb98b751d33d13c5fa2242054f829f5eb8be0.tar.gz chat-9f5fb98b751d33d13c5fa2242054f829f5eb8be0.tar.bz2 chat-9f5fb98b751d33d13c5fa2242054f829f5eb8be0.zip |
Fix system admin not seeing manage channel members options (#6831)
Diffstat (limited to 'webapp/components/channel_members_dropdown')
-rw-r--r-- | webapp/components/channel_members_dropdown/channel_members_dropdown.jsx | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx b/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx index 1deabb0d3..f8ff3a4f6 100644 --- a/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx +++ b/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx @@ -189,37 +189,35 @@ export default class ChannelMembersDropdown extends React.Component { ); } - if (!makeChannelMember || !makeChannelAdmin || !removeFromChannel) { + if ((makeChannelMember || makeChannelAdmin) && removeFromChannel) { return ( - <div/> + <div className='dropdown member-drop'> + <a + id='channelMemberDropdown' + href='#' + className='dropdown-toggle theme' + type='button' + data-toggle='dropdown' + aria-expanded='true' + > + <span>{role} </span> + <span className='fa fa-chevron-down'/> + </a> + <ul + className='dropdown-menu member-menu' + role='menu' + > + {makeChannelMember} + {makeChannelAdmin} + {removeFromChannel} + </ul> + {serverError} + </div> ); } + } - return ( - <div className='dropdown member-drop'> - <a - id='channelMemberDropdown' - href='#' - className='dropdown-toggle theme' - type='button' - data-toggle='dropdown' - aria-expanded='true' - > - <span>{role} </span> - <span className='fa fa-chevron-down'/> - </a> - <ul - className='dropdown-menu member-menu' - role='menu' - > - {makeChannelMember} - {makeChannelAdmin} - {removeFromChannel} - </ul> - {serverError} - </div> - ); - } else if (this.canRemoveMember() && this.props.channel.name !== Constants.DEFAULT_CHANNEL) { + if (this.canRemoveMember() && this.props.channel.name !== Constants.DEFAULT_CHANNEL) { return ( <button id='removeMember' @@ -233,7 +231,9 @@ export default class ChannelMembersDropdown extends React.Component { /> </button> ); - } else if (isChannelAdmin) { + } + + if (isChannelAdmin) { if (this.props.channel.name === Constants.DEFAULT_CHANNEL) { return ( <div/> |