diff options
Diffstat (limited to 'webapp')
-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/> |