diff options
| author | George Goldberg <george@gberg.me> | 2017-05-09 21:00:54 +0100 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-05-09 16:00:54 -0400 |
| commit | c8a4a8c6e6b04ff4f8f6d8e9c632b63b3cf74f42 (patch) | |
| tree | 7468e02bd12b1715f0c01646e8ce2e82458b9f39 /model/config.go | |
| parent | 0c701cc1d02c3d3b630050a0547f9dc632596013 (diff) | |
| download | chat-c8a4a8c6e6b04ff4f8f6d8e9c632b63b3cf74f42.tar.gz chat-c8a4a8c6e6b04ff4f8f6d8e9c632b63b3cf74f42.tar.bz2 chat-c8a4a8c6e6b04ff4f8f6d8e9c632b63b3cf74f42.zip | |
PLT-6512: Don't set channel creation to channel admins. (#6368)
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/model/config.go b/model/config.go index 706d07246..b233d8b55 100644 --- a/model/config.go +++ b/model/config.go @@ -609,13 +609,21 @@ func (o *Config) SetDefaults() { if o.TeamSettings.RestrictPublicChannelCreation == nil { o.TeamSettings.RestrictPublicChannelCreation = new(string) // If this setting does not exist, assume migration from <3.6, so use management setting as default. - *o.TeamSettings.RestrictPublicChannelCreation = *o.TeamSettings.RestrictPublicChannelManagement + if *o.TeamSettings.RestrictPublicChannelManagement == PERMISSIONS_CHANNEL_ADMIN { + *o.TeamSettings.RestrictPublicChannelCreation = PERMISSIONS_TEAM_ADMIN + } else { + *o.TeamSettings.RestrictPublicChannelCreation = *o.TeamSettings.RestrictPublicChannelManagement + } } if o.TeamSettings.RestrictPrivateChannelCreation == nil { o.TeamSettings.RestrictPrivateChannelCreation = new(string) // If this setting does not exist, assume migration from <3.6, so use management setting as default. - *o.TeamSettings.RestrictPrivateChannelCreation = *o.TeamSettings.RestrictPrivateChannelManagement + if *o.TeamSettings.RestrictPrivateChannelManagement == PERMISSIONS_CHANNEL_ADMIN { + *o.TeamSettings.RestrictPrivateChannelCreation = PERMISSIONS_TEAM_ADMIN + } else { + *o.TeamSettings.RestrictPrivateChannelCreation = *o.TeamSettings.RestrictPrivateChannelManagement + } } if o.TeamSettings.RestrictPublicChannelDeletion == nil { |