summaryrefslogtreecommitdiffstats
path: root/utils/config.go
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2018-05-31 10:25:31 +0100
committerGeorge Goldberg <george@gberg.me>2018-05-31 10:25:31 +0100
commit27e7841a734e9c3ed71f988a653f5865d2ef6f91 (patch)
tree1ccc65246fb166c25a9923f4e05ad7d6223892d1 /utils/config.go
parente39f5f46f3f6cdcb7ab8aeef8c601047f5942f85 (diff)
parent994ccf475f96bcad668269fe25b0d22e975bc222 (diff)
downloadchat-27e7841a734e9c3ed71f988a653f5865d2ef6f91.tar.gz
chat-27e7841a734e9c3ed71f988a653f5865d2ef6f91.tar.bz2
chat-27e7841a734e9c3ed71f988a653f5865d2ef6f91.zip
Merge branch 'advanced-permissions-phase-2'
Diffstat (limited to 'utils/config.go')
-rw-r--r--utils/config.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index 2e6f4182f..8feb7d882 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -554,6 +554,8 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
hasImageProxy := c.ServiceSettings.ImageProxyType != nil && *c.ServiceSettings.ImageProxyType != "" && c.ServiceSettings.ImageProxyURL != nil && *c.ServiceSettings.ImageProxyURL != ""
props["HasImageProxy"] = strconv.FormatBool(hasImageProxy)
+ props["RunJobs"] = strconv.FormatBool(*c.JobSettings.RunJobs)
+
// Set default values for all options that require a license.
props["ExperimentalHideTownSquareinLHS"] = "false"
props["ExperimentalTownSquareIsReadOnly"] = "false"