From c8a4a8c6e6b04ff4f8f6d8e9c632b63b3cf74f42 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Tue, 9 May 2017 21:00:54 +0100 Subject: PLT-6512: Don't set channel creation to channel admins. (#6368) --- model/config.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'model/config.go') 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 { -- cgit v1.2.3-1-g7c22 From e22bab5be03337e39c14bffc911dac1bd7385ed4 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 11 May 2017 16:18:48 -0400 Subject: PLT-6566 Prevented terms of service link from being blank (#6392) --- model/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'model/config.go') diff --git a/model/config.go b/model/config.go index b233d8b55..aedba7013 100644 --- a/model/config.go +++ b/model/config.go @@ -714,7 +714,7 @@ func (o *Config) SetDefaults() { } if !IsSafeLink(o.SupportSettings.TermsOfServiceLink) { - *o.SupportSettings.TermsOfServiceLink = "" + *o.SupportSettings.TermsOfServiceLink = SUPPORT_SETTINGS_DEFAULT_TERMS_OF_SERVICE_LINK } if o.SupportSettings.TermsOfServiceLink == nil { -- cgit v1.2.3-1-g7c22