IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix system admin not seeing manage channel members options (#6831)

Browse Source
This commit is contained in:
Joram Wilander
2017-07-04 04:06:18 -04:00
committed by George Goldberg
parent 7a09b4bd78
commit 9f5fb98b75
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
webapp/components/channel_members_dropdown/channel_members_dropdown.jsx
View File

@@ -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/>