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/channel_header.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/channel_header.jsx')
-rw-r--r-- | web/react/components/channel_header.jsx | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index a8d4ec100..79c7f90a9 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -276,26 +276,27 @@ export default class ChannelHeader extends React.Component { </li> ); - if (!ChannelStore.isDefault(channel)) { - if (isAdmin) { - dropdownContents.push( - <li - key='rename_channel' - role='presentation' + if (isAdmin) { + dropdownContents.push( + <li + key='rename_channel' + role='presentation' + > + <a + role='menuitem' + href='#' + data-toggle='modal' + data-target='#rename_channel' + data-display={channel.display_name} + data-name={channel.name} + data-channelid={channel.id} > - <a - role='menuitem' - href='#' - data-toggle='modal' - data-target='#rename_channel' - data-display={channel.display_name} - data-name={channel.name} - data-channelid={channel.id} - > - {'Rename '}{channelTerm}{'...'} - </a> - </li> - ); + {'Rename '}{channelTerm}{'...'} + </a> + </li> + ); + + if (!ChannelStore.isDefault(channel)) { dropdownContents.push( <li key='delete_channel' @@ -314,7 +315,9 @@ export default class ChannelHeader extends React.Component { </li> ); } + } + if (!ChannelStore.isDefault(channel)) { dropdownContents.push( <li key='leave_channel' |