PLT-5080 (WebApp): Channel Admin permission level. (#5047)

* PLT-5080 (WebApp): Channel Admin permission level.

For channel management and channel deletion.

* Fix some incorrect showing/hiding of options.

* Remove incorrect client calls that was overwriting my channel members.
Этот коммит содержится в:
George Goldberg
2017-02-24 01:15:10 +00:00
коммит произвёл Christopher Speller
родитель bc9f3dfa24
Коммит 8509c2f0b0
8 изменённых файлов: 40 добавлений и 11 удалений

Просмотреть файл

@@ -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 {
</li>
);
if (ChannelUtils.showManagementOptions(channel, isAdmin, isSystemAdmin)) {
if (ChannelUtils.showManagementOptions(channel, isAdmin, isSystemAdmin, isChannelAdmin)) {
dropdownContents.push(
<li
key='set_channel_header'
@@ -541,7 +542,7 @@ export default class ChannelHeader extends React.Component {
);
}
if (ChannelUtils.showDeleteOption(channel, isAdmin, isSystemAdmin)) {
if (ChannelUtils.showDeleteOption(channel, isAdmin, isSystemAdmin, isChannelAdmin)) {
if (!ChannelStore.isDefault(channel)) {
dropdownContents.push(deleteOption);
}