From 3fba8e42b140c1189bf3c06882cce5e2231e63da Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Fri, 8 Jan 2016 12:41:26 -0600
Subject: partial fix for UI

---
 model/config.go | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

(limited to 'model/config.go')

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 {
-- 
cgit v1.2.3-1-g7c22