From 463065c8ba4b4aece7fd9b7764ba917df3e73292 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 17 May 2018 16:29:31 +0100 Subject: MM-10606: License feature flag for custom schemes. (#8804) * MM-10606: Add new field to license for custom schemes. * Add feature flag to license check for Schemes. --- utils/license.go | 1 + 1 file changed, 1 insertion(+) (limited to 'utils') diff --git a/utils/license.go b/utils/license.go index aa89026ea..1d76cf994 100644 --- a/utils/license.go +++ b/utils/license.go @@ -152,6 +152,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 -- cgit v1.2.3-1-g7c22 From a51b2367a34d5cbefe720232b35ccf0d1aa63c98 Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Thu, 24 May 2018 10:22:54 -0400 Subject: MM-10402: Adds RunJobs to client config API. (#8846) --- utils/config.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'utils') diff --git a/utils/config.go b/utils/config.go index 18e25c999..9a606389d 100644 --- a/utils/config.go +++ b/utils/config.go @@ -553,6 +553,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["ExperimentalTownSquareIsReadOnly"] = "false" props["ExperimentalEnableAuthenticationTransfer"] = "true" -- cgit v1.2.3-1-g7c22