diff options
| author | enahum <nahumhbl@gmail.com> | 2016-11-04 13:05:32 -0300 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-11-04 12:05:32 -0400 |
| commit | 772b57386f4dd6bca97e7b7508e9c286bb60502f (patch) | |
| tree | f99074ba97d40abb12c56a199ce9d6262a9ae442 /utils | |
| parent | 6289c726862c9d1356fb8d78694d1ef2d7527756 (diff) | |
| download | chat-772b57386f4dd6bca97e7b7508e9c286bb60502f.tar.gz chat-772b57386f4dd6bca97e7b7508e9c286bb60502f.tar.bz2 chat-772b57386f4dd6bca97e7b7508e9c286bb60502f.zip | |
PLT-4550 move webrtc to TE (#4440)
* PLT-4550 move webrtc to TE
* remove webrtc from makefile enterprise tests
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 6 | ||||
| -rw-r--r-- | utils/license.go | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/utils/config.go b/utils/config.go index 819ce6185..0f5d69a13 100644 --- a/utils/config.go +++ b/utils/config.go @@ -292,6 +292,8 @@ func getClientConfig(c *model.Config) map[string]string { props["AndroidAppDownloadLink"] = *c.NativeAppSettings.AndroidAppDownloadLink props["IosAppDownloadLink"] = *c.NativeAppSettings.IosAppDownloadLink + props["EnableWebrtc"] = strconv.FormatBool(*c.WebrtcSettings.Enable) + if IsLicensed { if *License.Features.CustomBrand { props["EnableCustomBrand"] = strconv.FormatBool(*c.TeamSettings.EnableCustomBrand) @@ -342,10 +344,6 @@ func getClientConfig(c *model.Config) map[string]string { props["PasswordRequireNumber"] = strconv.FormatBool(*c.PasswordSettings.Number) props["PasswordRequireSymbol"] = strconv.FormatBool(*c.PasswordSettings.Symbol) } - - if *License.Features.Webrtc { - props["EnableWebrtc"] = strconv.FormatBool(*c.WebrtcSettings.Enable) - } } return props diff --git a/utils/license.go b/utils/license.go index ae27dbc88..4d6387788 100644 --- a/utils/license.go +++ b/utils/license.go @@ -125,7 +125,6 @@ func getClientLicense(l *model.License) map[string]string { props["Cluster"] = strconv.FormatBool(*l.Features.Cluster) props["GoogleOAuth"] = strconv.FormatBool(*l.Features.GoogleOAuth) props["Office365OAuth"] = strconv.FormatBool(*l.Features.Office365OAuth) - props["Webrtc"] = strconv.FormatBool(*l.Features.Webrtc) props["Compliance"] = strconv.FormatBool(*l.Features.Compliance) props["CustomBrand"] = strconv.FormatBool(*l.Features.CustomBrand) props["MHPNS"] = strconv.FormatBool(*l.Features.MHPNS) |