summaryrefslogtreecommitdiffstats
path: root/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx
diff options
context:
space:
mode:
authorJonathan <jonfritz@gmail.com>2017-08-09 09:34:09 -0400
committerGitHub <noreply@github.com>2017-08-09 09:34:09 -0400
commitfd6856b674cc24deb708f2cd36c247662ee10bc7 (patch)
tree7c47d2468d894d7867fda71f0f6ac252832dd728 /webapp/components/channel_members_dropdown/channel_members_dropdown.jsx
parent6b741c4cea36f54b8f20c4a3e5871f00123db185 (diff)
downloadchat-fd6856b674cc24deb708f2cd36c247662ee10bc7.tar.gz
chat-fd6856b674cc24deb708f2cd36c247662ee10bc7.tar.bz2
chat-fd6856b674cc24deb708f2cd36c247662ee10bc7.zip
PLT-7206: Remove the "Delete Channel" option for private channels if you're the last channel member and policy setting restricts channel deletion (#7050)
* PLT-7206: UI changes. Removed last user in channel loophole, refactored code to clean it up, added differentiated support for public and private channels, added unit tests. Still need to implement server-side checks * PLT-7206: All helper methods in channel_utils.jsx now accept the same three boolean variables in the same order and use the same boolean logic to check their values. * PLT-7206: Added unit tests for showManagementOptions(...) * PLT-7206: Fixed test case descriptions * Added unit tests for showCreateOption(...) * PLT-7206: Added unit tests for canManageMembers(...) * PLT-7206: Removed last person in channel loophole from server-side code * PLT-7206: Reverted config.json * PLT-7206: Fixed double negatives in unit test names * PLT-7206: PR feedback - Removed confusing comment and unused variable
Diffstat (limited to 'webapp/components/channel_members_dropdown/channel_members_dropdown.jsx')
-rw-r--r--webapp/components/channel_members_dropdown/channel_members_dropdown.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx b/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx
index f8ff3a4f6..fbad6cde1 100644
--- a/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx
+++ b/webapp/components/channel_members_dropdown/channel_members_dropdown.jsx
@@ -95,7 +95,7 @@ export default class ChannelMembersDropdown extends React.Component {
// Checks if the current user has the power to remove this member from the channel.
canRemoveMember() {
- return canManageMembers(this.props.channel, UserStore.isSystemAdminForCurrentUser(), TeamStore.isTeamAdminForCurrentTeam(), ChannelStore.isChannelAdminForCurrentChannel());
+ return canManageMembers(this.props.channel, ChannelStore.isChannelAdminForCurrentChannel(), TeamStore.isTeamAdminForCurrentTeam(), UserStore.isSystemAdminForCurrentUser());
}
render() {