diff options
| author | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
| commit | 9d109b070037951fcd0832b785eba8a3db9a157c (patch) | |
| tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /model | |
| parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
| parent | a21a06afd9907e9911dcb166d902cba9f405c7cb (diff) | |
| download | chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.gz chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.bz2 chat-9d109b070037951fcd0832b785eba8a3db9a157c.zip | |
Merge branch 'release-3.9' into merge-3.9
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 14 | ||||
| -rw-r--r-- | model/session.go | 13 |
2 files changed, 18 insertions, 9 deletions
diff --git a/model/config.go b/model/config.go index e0ed85227..907620124 100644 --- a/model/config.go +++ b/model/config.go @@ -615,13 +615,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 { @@ -712,7 +720,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 { diff --git a/model/session.go b/model/session.go index 38d1c91f1..4f3547582 100644 --- a/model/session.go +++ b/model/session.go @@ -10,12 +10,13 @@ import ( ) const ( - SESSION_COOKIE_TOKEN = "MMAUTHTOKEN" - SESSION_COOKIE_USER = "MMUSERID" - SESSION_CACHE_SIZE = 35000 - SESSION_PROP_PLATFORM = "platform" - SESSION_PROP_OS = "os" - SESSION_PROP_BROWSER = "browser" + SESSION_COOKIE_TOKEN = "MMAUTHTOKEN" + SESSION_COOKIE_USER = "MMUSERID" + SESSION_CACHE_SIZE = 35000 + SESSION_PROP_PLATFORM = "platform" + SESSION_PROP_OS = "os" + SESSION_PROP_BROWSER = "browser" + SESSION_ACTIVITY_TIMEOUT = 1000 * 60 * 5 // 5 minutes ) type Session struct { |