diff options
author | =Corey Hulen <corey@hulen.com> | 2016-01-08 12:41:26 -0600 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-01-08 12:41:26 -0600 |
commit | 3fba8e42b140c1189bf3c06882cce5e2231e63da (patch) | |
tree | 7a0721cecf6624fc9c1fd71449628472b941ddeb /model/config.go | |
parent | 001a4448ca5fb0018eeb442915b473b121c04bf3 (diff) | |
download | chat-3fba8e42b140c1189bf3c06882cce5e2231e63da.tar.gz chat-3fba8e42b140c1189bf3c06882cce5e2231e63da.tar.bz2 chat-3fba8e42b140c1189bf3c06882cce5e2231e63da.zip |
partial fix for UI
Diffstat (limited to 'model/config.go')
-rw-r--r-- | model/config.go | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/model/config.go b/model/config.go index ed56ed0c7..7d9ff41f1 100644 --- a/model/config.go +++ b/model/config.go @@ -24,22 +24,24 @@ const ( ) type ServiceSettings struct { - ListenAddress string - MaximumLoginAttempts int - SegmentDeveloperKey string - GoogleDeveloperKey string - EnableOAuthServiceProvider bool - EnableIncomingWebhooks bool - EnableOutgoingWebhooks bool - EnablePostUsernameOverride bool - EnablePostIconOverride bool - EnableTesting bool - EnableDeveloper *bool - EnableSecurityFixAlert *bool - SessionLengthWebInDays *int - SessionLengthMobileInDays *int - SessionLengthSSOInDays *int - SessionCacheInMinutes *int + ListenAddress string + MaximumLoginAttempts int + SegmentDeveloperKey string + GoogleDeveloperKey string + EnableOAuthServiceProvider bool + EnableIncomingWebhooks bool + EnableOutgoingWebhooks bool + EnableCommands *bool + EnableOnlyAdminIntegrations *bool + EnablePostUsernameOverride bool + EnablePostIconOverride bool + EnableTesting bool + EnableDeveloper *bool + EnableSecurityFixAlert *bool + SessionLengthWebInDays *int + SessionLengthMobileInDays *int + SessionLengthSSOInDays *int + SessionCacheInMinutes *int } type SSOSettings struct { @@ -330,6 +332,16 @@ func (o *Config) SetDefaults() { o.ServiceSettings.SessionCacheInMinutes = new(int) *o.ServiceSettings.SessionCacheInMinutes = 10 } + + if o.ServiceSettings.EnableCommands == nil { + o.ServiceSettings.EnableCommands = new(bool) + *o.ServiceSettings.EnableCommands = false + } + + if o.ServiceSettings.EnableOnlyAdminIntegrations == nil { + o.ServiceSettings.EnableOnlyAdminIntegrations = new(bool) + *o.ServiceSettings.EnableOnlyAdminIntegrations = true + } } func (o *Config) IsValid() *AppError { |