diff options
author | Ryan Wang <R-Wang97@users.noreply.github.com> | 2017-04-20 11:25:03 -0400 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-04-20 16:25:03 +0100 |
commit | ff8b91027fd531880ea951bee1a0b63e506b0ae8 (patch) | |
tree | 124123e3ac17302fc1a395ede7b31c03f227f548 /webapp/components/popover_list_members.jsx | |
parent | f758f9ff3a617dd5939e1e7851fdbe10d03cd5a8 (diff) | |
download | chat-ff8b91027fd531880ea951bee1a0b63e506b0ae8.tar.gz chat-ff8b91027fd531880ea951bee1a0b63e506b0ae8.tar.bz2 chat-ff8b91027fd531880ea951bee1a0b63e506b0ae8.zip |
Add modified view members modal to Town Square (#5695)
Diffstat (limited to 'webapp/components/popover_list_members.jsx')
-rw-r--r-- | webapp/components/popover_list_members.jsx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/webapp/components/popover_list_members.jsx b/webapp/components/popover_list_members.jsx index 268a87a6b..3af53cb70 100644 --- a/webapp/components/popover_list_members.jsx +++ b/webapp/components/popover_list_members.jsx @@ -70,17 +70,10 @@ export default class PopoverListMembers extends React.Component { showMembersModal(e) { e.preventDefault(); - if (ChannelStore.isDefault(this.props.channel)) { - this.setState({ - showPopover: false, - showTeamMembersModal: true - }); - } else { - this.setState({ - showPopover: false, - showChannelMembersModal: true - }); - } + this.setState({ + showPopover: false, + showChannelMembersModal: true + }); } render() { @@ -158,7 +151,11 @@ export default class PopoverListMembers extends React.Component { defaultMessage='Manage Members' /> ); - if (!canManageMembers(this.props.channel, isSystemAdmin, isTeamAdmin, isChannelAdmin) && !ChannelStore.isDefault(this.props.channel)) { + + const manageMembers = canManageMembers(this.props.channel, isSystemAdmin, isTeamAdmin, isChannelAdmin); + const isDefaultChannel = ChannelStore.isDefault(this.props.channel); + + if ((manageMembers === false && isDefaultChannel === false) || isDefaultChannel) { membersName = ( <FormattedMessage id='members_popover.viewMembers' |