diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-11-16 15:26:09 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-11-16 15:26:09 -0500 |
commit | 51f59ec869415e6a4c8eeff0e29d14854f1ad434 (patch) | |
tree | 54cda34559e7dd2b053311d329c216c0d8505d51 /web/react/components/navbar.jsx | |
parent | 48d2f86b90b3e0b02cb28f3e8b6e4d454f9cb869 (diff) | |
parent | 1874a16666cdcf65b11f2d0f03d50d6b880e15f7 (diff) | |
download | chat-51f59ec869415e6a4c8eeff0e29d14854f1ad434.tar.gz chat-51f59ec869415e6a4c8eeff0e29d14854f1ad434.tar.bz2 chat-51f59ec869415e6a4c8eeff0e29d14854f1ad434.zip |
Merge pull request #1437 from rgarmsen2295/plt-1086
PLT-1086 Enables the ability to rename the default channel (Town Square)
Diffstat (limited to 'web/react/components/navbar.jsx')
-rw-r--r-- | web/react/components/navbar.jsx | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx index af29f219e..7ad1f9305 100644 --- a/web/react/components/navbar.jsx +++ b/web/react/components/navbar.jsx @@ -178,18 +178,35 @@ export default class Navbar extends React.Component { var manageMembersOption; var renameChannelOption; var deleteChannelOption; - if (!isDirect && isAdmin && !ChannelStore.isDefault(channel)) { - manageMembersOption = ( - <li role='presentation'> - <a - role='menuitem' - href='#' - onClick={() => this.setState({showMembersModal: true})} - > - {'Manage Members'} - </a> - </li> - ); + if (!isDirect && isAdmin) { + if (!ChannelStore.isDefault(channel)) { + manageMembersOption = ( + <li role='presentation'> + <a + role='menuitem' + href='#' + onClick={() => this.setState({showMembersModal: true})} + > + {'Manage Members'} + </a> + </li> + ); + + deleteChannelOption = ( + <li role='presentation'> + <a + role='menuitem' + href='#' + data-toggle='modal' + data-target='#delete_channel' + data-title={channel.display_name} + data-channelid={channel.id} + > + {'Delete Channel...'} + </a> + </li> + ); + } renameChannelOption = ( <li role='presentation'> @@ -206,21 +223,6 @@ export default class Navbar extends React.Component { </a> </li> ); - - deleteChannelOption = ( - <li role='presentation'> - <a - role='menuitem' - href='#' - data-toggle='modal' - data-target='#delete_channel' - data-title={channel.display_name} - data-channelid={channel.id} - > - {'Delete Channel...'} - </a> - </li> - ); } var notificationPreferenceOption; |