diff --git a/actions/channel_actions.jsx b/actions/channel_actions.jsx index 4b4e3e10ca18..08d8f1486e76 100644 --- a/actions/channel_actions.jsx +++ b/actions/channel_actions.jsx @@ -132,7 +132,6 @@ export function makeUserChannelAdmin(channelId, userId, success, error) { userId, 'channel_user channel_admin', () => { - AsyncClient.getChannelMember(channelId, userId); getChannelMembersForUserIds(channelId, [userId]); if (success) { @@ -153,7 +152,6 @@ export function makeUserChannelMember(channelId, userId, success, error) { userId, 'channel_user', () => { - AsyncClient.getChannelMember(channelId, userId); getChannelMembersForUserIds(channelId, [userId]); if (success) { diff --git a/components/admin_console/policy_settings.jsx b/components/admin_console/policy_settings.jsx index 391726a93221..5d82fc69c402 100644 --- a/components/admin_console/policy_settings.jsx +++ b/components/admin_console/policy_settings.jsx @@ -115,6 +115,7 @@ export default class PolicySettings extends AdminSettings { id='restrictPublicChannelManagement' 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')} ]} @@ -137,6 +138,7 @@ export default class PolicySettings extends AdminSettings { id='restrictPublicChannelDeletion' 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')} ]} @@ -195,6 +197,7 @@ export default class PolicySettings extends AdminSettings { id='restrictPrivateChannelManagement' 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')} ]} @@ -217,6 +220,7 @@ export default class PolicySettings extends AdminSettings { id='restrictPrivateChannelDeletion' 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')} ]} diff --git a/components/channel_header.jsx b/components/channel_header.jsx index 54e73cda5280..ee060577c7b6 100644 --- a/components/channel_header.jsx +++ b/components/channel_header.jsx @@ -243,6 +243,7 @@ export default class ChannelHeader extends React.Component { let channelTitle = channel.display_name; const isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser(); const isSystemAdmin = UserStore.isSystemAdminForCurrentUser(); + const isChannelAdmin = ChannelStore.isChannelAdminForCurrentChannel(); const isDirect = (this.state.channel.type === 'D'); let webrtc; @@ -476,7 +477,7 @@ export default class ChannelHeader extends React.Component { ); - if (ChannelUtils.showManagementOptions(channel, isAdmin, isSystemAdmin)) { + if (ChannelUtils.showManagementOptions(channel, isAdmin, isSystemAdmin, isChannelAdmin)) { dropdownContents.push(