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

PLT-6139 (WebApp): Manage Private Channel Members (#5947)

Browse Source 
Honour the policy setting for add/remove members from private channels
in the WebApp UI.
This commit is contained in:
George Goldberg
2017-04-04 19:43:22 +01:00
committed by Harrison Healey
parent 6bf080393d
commit 6bb65ef420
7 changed files with 148 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
webapp/components/admin_console/policy_settings.jsx
View File

@@ -34,6 +34,7 @@ export default class PolicySettings extends AdminSettings {
config.TeamSettings.RestrictPrivateChannelManagement = this.state.restrictPrivateChannelManagement;
config.TeamSettings.RestrictPublicChannelDeletion = this.state.restrictPublicChannelDeletion;
config.TeamSettings.RestrictPrivateChannelDeletion = this.state.restrictPrivateChannelDeletion;
config.TeamSettings.RestrictPrivateChannelManageMembers = this.state.restrictPrivateChannelManageMembers;
return config;
}
@@ -49,7 +50,8 @@ export default class PolicySettings extends AdminSettings {
restrictPublicChannelManagement: config.TeamSettings.RestrictPublicChannelManagement,
restrictPrivateChannelManagement: config.TeamSettings.RestrictPrivateChannelManagement,
restrictPublicChannelDeletion: config.TeamSettings.RestrictPublicChannelDeletion,
restrictPrivateChannelDeletion: config.TeamSettings.RestrictPrivateChannelDeletion
restrictPrivateChannelDeletion: config.TeamSettings.RestrictPrivateChannelDeletion,
restrictPrivateChannelManageMembers: config.TeamSettings.RestrictPrivateChannelManageMembers
};
}
@@ -214,6 +216,29 @@ export default class PolicySettings extends AdminSettings {
/>
}
/>
<DropdownSetting
id='restrictPrivateChannelManageMembers'
values={[
{value: Constants.PERMISSIONS_ALL, text: Utils.localizeMessage('admin.general.policy.permissionsAllChannel', 'All channel members')},
{value: Constants.PERMISSIONS_CHANNEL_ADMIN, text: Utils.localizeMessage('admin.general.policy.permissionsChannelAdmin', 'Channel, Team and System Admins')},
{value: Constants.PERMISSIONS_TEAM_ADMIN, text: Utils.localizeMessage('admin.general.policy.permissionsAdmin', 'Team and System Admins')},
{value: Constants.PERMISSIONS_SYSTEM_ADMIN, text: Utils.localizeMessage('admin.general.policy.permissionsSystemAdmin', 'System Admins')}
]}
label={
<FormattedMessage
id='admin.general.policy.restrictPrivateChannelManageMembersTitle'
defaultMessage='Enable managing of private group members for:'
/>
}
value={this.state.restrictPrivateChannelManageMembers}
onChange={this.handleChange}
helpText={
<FormattedMessage
id='admin.general.policy.restrictPrivateChannelManageMembersDescription'
defaultMessage='Set policy on who can add and remove members from private groups.'
/>
}
/>
<DropdownSetting
id='restrictPrivateChannelDeletion'
values={[