From 6bb65ef420fba17ec02e9b8005ca58bb60321cdc Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Tue, 4 Apr 2017 19:43:22 +0100 Subject: PLT-6139 (WebApp): Manage Private Channel Members (#5947) Honour the policy setting for add/remove members from private channels in the WebApp UI. --- webapp/components/channel_members_dropdown.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webapp/components/channel_members_dropdown.jsx') diff --git a/webapp/components/channel_members_dropdown.jsx b/webapp/components/channel_members_dropdown.jsx index 5ccdcd4c1..8c8c7dc3a 100644 --- a/webapp/components/channel_members_dropdown.jsx +++ b/webapp/components/channel_members_dropdown.jsx @@ -9,6 +9,7 @@ import {removeUserFromChannel, makeUserChannelAdmin, makeUserChannelMember} from import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; +import {canManageMembers} from 'utils/channel_utils.jsx'; import React from 'react'; import {FormattedMessage} from 'react-intl'; @@ -91,8 +92,7 @@ export default class ChannelMembersDropdown extends React.Component { // Checks if the current user has the power to remove this member from the channel. canRemoveMember() { - // TODO: This will be implemented as part of PLT-5047. - return true; + return canManageMembers(this.props.channel, UserStore.isSystemAdminForCurrentUser(), TeamStore.isTeamAdminForCurrentTeam(), ChannelStore.isChannelAdminForCurrentChannel()); } render() { -- cgit v1.2.3-1-g7c22