diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-05 06:32:27 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-05 06:32:27 +0800 |
commit | 8f8a978e84ec8bbeac22928e6112bc697fa7176d (patch) | |
tree | a82993cfcd1aab059554feeeb1a6256d4640eab4 /webapp/components/channel_header.jsx | |
parent | 6d6ed309b9b7f2b77cd013583990c6eb88f18aff (diff) | |
download | chat-8f8a978e84ec8bbeac22928e6112bc697fa7176d.tar.gz chat-8f8a978e84ec8bbeac22928e6112bc697fa7176d.tar.bz2 chat-8f8a978e84ec8bbeac22928e6112bc697fa7176d.zip |
[PLT-6838] Restrict channel delete option per permission policy even for last channel member (#6706)
* channel delete option is hidden from the menu unless there is appropriate permissions as set in the policy page
* apply to public channel only and add restriction to API layer
* updated channel deletion
Diffstat (limited to 'webapp/components/channel_header.jsx')
-rw-r--r-- | webapp/components/channel_header.jsx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index a409baec6..b6fcf7ef7 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -720,11 +720,7 @@ export default class ChannelHeader extends React.Component { ); } - if (ChannelUtils.showDeleteOption(channel, isAdmin, isSystemAdmin, isChannelAdmin)) { - if (!ChannelStore.isDefault(channel)) { - dropdownContents.push(deleteOption); - } - } else if (this.state.userCount === 1) { + if (ChannelUtils.showDeleteOption(channel, isAdmin, isSystemAdmin, isChannelAdmin, this.state.userCount)) { dropdownContents.push(deleteOption); } |