diff options
| author | George Goldberg <george@gberg.me> | 2018-05-31 10:25:31 +0100 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-05-31 10:25:31 +0100 |
| commit | 27e7841a734e9c3ed71f988a653f5865d2ef6f91 (patch) | |
| tree | 1ccc65246fb166c25a9923f4e05ad7d6223892d1 /utils | |
| parent | e39f5f46f3f6cdcb7ab8aeef8c601047f5942f85 (diff) | |
| parent | 994ccf475f96bcad668269fe25b0d22e975bc222 (diff) | |
| download | chat-27e7841a734e9c3ed71f988a653f5865d2ef6f91.tar.gz chat-27e7841a734e9c3ed71f988a653f5865d2ef6f91.tar.bz2 chat-27e7841a734e9c3ed71f988a653f5865d2ef6f91.zip | |
Merge branch 'advanced-permissions-phase-2'
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 2 | ||||
| -rw-r--r-- | utils/license.go | 1 |
2 files changed, 3 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" diff --git a/utils/license.go b/utils/license.go index 832d41557..8bb214734 100644 --- a/utils/license.go +++ b/utils/license.go @@ -151,6 +151,7 @@ func GetClientLicense(l *model.License) map[string]string { props["PhoneNumber"] = l.Customer.PhoneNumber props["EmailNotificationContents"] = strconv.FormatBool(*l.Features.EmailNotificationContents) props["MessageExport"] = strconv.FormatBool(*l.Features.MessageExport) + props["CustomPermissionsSchemes"] = strconv.FormatBool(*l.Features.CustomPermissionsSchemes) } return props |