From 772b57386f4dd6bca97e7b7508e9c286bb60502f Mon Sep 17 00:00:00 2001 From: enahum Date: Fri, 4 Nov 2016 13:05:32 -0300 Subject: PLT-4550 move webrtc to TE (#4440) * PLT-4550 move webrtc to TE * remove webrtc from makefile enterprise tests --- utils/config.go | 6 ++---- utils/license.go | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'utils') 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) -- cgit v1.2.3-1-g7c22