From 7ed1177a2b676aa4c93515268642c855cfe57a37 Mon Sep 17 00:00:00 2001
From: Chris Duarte <csduarte@users.noreply.github.com>
Date: Fri, 8 Dec 2017 11:15:48 -0800
Subject: [PATCH] add config option to hide tutorial screens (#7840)

---
 config/default.json | 3 ++-
 model/config.go     | 5 +++++
 utils/config.go     | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/default.json b/config/default.json
index 14acb47d06..d772f2576f 100644
--- a/config/default.json
+++ b/config/default.json
@@ -54,7 +54,8 @@
         "EnableUserStatuses": true,
         "ClusterLogTimeoutMilliseconds": 2000,
         "EnablePreviewFeatures": true,
-        "CloseUnusedDirectMessages": false
+        "CloseUnusedDirectMessages": false,
+        "EnableTutorial": true
     },
     "TeamSettings": {
         "SiteName": "Mattermost",
diff --git a/model/config.go b/model/config.go
index 544f9b33fa..918d15b9a9 100644
--- a/model/config.go
+++ b/model/config.go
@@ -212,6 +212,7 @@ type ServiceSettings struct {
 	ClusterLogTimeoutMilliseconds            *int
 	CloseUnusedDirectMessages                *bool
 	EnablePreviewFeatures                    *bool
+	EnableTutorial                           *bool
 }
 
 func (s *ServiceSettings) SetDefaults() {
@@ -331,6 +332,10 @@ func (s *ServiceSettings) SetDefaults() {
 		s.CloseUnusedDirectMessages = NewBool(false)
 	}
 
+	if s.EnableTutorial == nil {
+		s.EnableTutorial = NewBool(true)
+	}
+
 	if s.SessionLengthWebInDays == nil {
 		s.SessionLengthWebInDays = NewInt(30)
 	}
diff --git a/utils/config.go b/utils/config.go
index 929e39346f..180bd7fea5 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -489,6 +489,7 @@ func getClientConfig(c *model.Config) map[string]string {
 	props["PostEditTimeLimit"] = fmt.Sprintf("%v", *c.ServiceSettings.PostEditTimeLimit)
 	props["CloseUnusedDirectMessages"] = strconv.FormatBool(*c.ServiceSettings.CloseUnusedDirectMessages)
 	props["EnablePreviewFeatures"] = strconv.FormatBool(*c.ServiceSettings.EnablePreviewFeatures)
+	props["EnableTutorial"] = strconv.FormatBool(*c.ServiceSettings.EnableTutorial)
 
 	props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications)
 	props["SendPushNotifications"] = strconv.FormatBool(*c.EmailSettings.SendPushNotifications)