summaryrefslogtreecommitdiffstats
path: root/webapp/components/navbar.jsx
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-02-24 01:15:10 +0000
committerChristopher Speller <crspeller@gmail.com>2017-02-23 20:15:10 -0500
commit8509c2f0b0893f8a7936a1943cc924db09bb62f4 (patch)
tree9b52c232fbc96fadaec26f0694ffc7e764651757 /webapp/components/navbar.jsx
parentbc9f3dfa240b2a197859de006baf2eceaafe0fcf (diff)
downloadchat-8509c2f0b0893f8a7936a1943cc924db09bb62f4.tar.gz
chat-8509c2f0b0893f8a7936a1943cc924db09bb62f4.tar.bz2
chat-8509c2f0b0893f8a7936a1943cc924db09bb62f4.zip
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.
Diffstat (limited to 'webapp/components/navbar.jsx')
-rw-r--r--webapp/components/navbar.jsx10
1 files changed, 6 insertions, 4 deletions
diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx
index b54b8701e..486c5d565 100644
--- a/webapp/components/navbar.jsx
+++ b/webapp/components/navbar.jsx
@@ -214,7 +214,7 @@ export default class Navbar extends React.Component {
}
};
- createDropdown(channel, channelTitle, isAdmin, isSystemAdmin, isDirect, popoverContent) {
+ createDropdown(channel, channelTitle, isAdmin, isSystemAdmin, isChannelAdmin, isDirect, popoverContent) {
if (channel) {
let channelTerm = (
<FormattedMessage
@@ -346,7 +346,7 @@ export default class Navbar extends React.Component {
</li>
);
- if (ChannelUtils.showManagementOptions(channel, isAdmin, isSystemAdmin)) {
+ if (ChannelUtils.showManagementOptions(channel, isAdmin, isSystemAdmin, isChannelAdmin)) {
setChannelHeaderOption = (
<li role='presentation'>
<a
@@ -402,7 +402,7 @@ export default class Navbar extends React.Component {
);
}
- if (ChannelUtils.showDeleteOption(channel, isAdmin, isSystemAdmin) || this.state.userCount === 1) {
+ if (ChannelUtils.showDeleteOption(channel, isAdmin, isSystemAdmin, isChannelAdmin) || this.state.userCount === 1) {
if (!ChannelStore.isDefault(channel)) {
deleteChannelOption = (
<li role='presentation'>
@@ -617,6 +617,7 @@ export default class Navbar extends React.Component {
var popoverContent;
var isAdmin = false;
var isSystemAdmin = false;
+ var isChannelAdmin = false;
var isDirect = false;
var editChannelHeaderModal = null;
@@ -647,6 +648,7 @@ export default class Navbar extends React.Component {
isAdmin = TeamStore.isTeamAdminForCurrentTeam() || UserStore.isSystemAdminForCurrentUser();
isSystemAdmin = UserStore.isSystemAdminForCurrentUser();
+ isChannelAdmin = ChannelStore.isChannelAdminForCurrentChannel();
if (channel.type === 'O') {
channelTitle = channel.display_name;
@@ -753,7 +755,7 @@ export default class Navbar extends React.Component {
</button>
);
- var channelMenuDropdown = this.createDropdown(channel, channelTitle, isAdmin, isSystemAdmin, isDirect, popoverContent);
+ var channelMenuDropdown = this.createDropdown(channel, channelTitle, isAdmin, isSystemAdmin, isChannelAdmin, isDirect, popoverContent);
return (
<div>