From 8a92888190a930eda13357ca1ebda2e088273ec2 Mon Sep 17 00:00:00 2001 From: Maria A Nunez Date: Tue, 24 Nov 2020 09:03:34 -0500 Subject: [PATCH] MM-30900 - Dropped condition of RestrictAdmin for filtering cloud_restrictable (#16365) --- api4/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api4/config.go b/api4/config.go index 38d068e0d0..ac03bbe9d8 100644 --- a/api4/config.go +++ b/api4/config.go @@ -65,7 +65,7 @@ func getConfig(c *Context, w http.ResponseWriter, r *http.Request) { auditRec.Success() w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") - if c.App.Srv().License() != nil && *c.App.Srv().License().Features.Cloud && *cfg.ExperimentalSettings.RestrictSystemAdmin { + if c.App.Srv().License() != nil && *c.App.Srv().License().Features.Cloud { w.Write([]byte(cfg.ToJsonFiltered(model.ConfigAccessTagType, model.ConfigAccessTagCloudRestrictable))) } else { w.Write([]byte(cfg.ToJson())) @@ -160,7 +160,7 @@ func updateConfig(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("updateConfig") w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") - if c.App.Srv().License() != nil && *c.App.Srv().License().Features.Cloud && *cfg.ExperimentalSettings.RestrictSystemAdmin { + if c.App.Srv().License() != nil && *c.App.Srv().License().Features.Cloud { w.Write([]byte(cfg.ToJsonFiltered(model.ConfigAccessTagType, model.ConfigAccessTagCloudRestrictable))) } else { w.Write([]byte(cfg.ToJson())) @@ -267,7 +267,7 @@ func patchConfig(c *Context, w http.ResponseWriter, r *http.Request) { } w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") - if c.App.Srv().License() != nil && *c.App.Srv().License().Features.Cloud && *cfg.ExperimentalSettings.RestrictSystemAdmin { + if c.App.Srv().License() != nil && *c.App.Srv().License().Features.Cloud { w.Write([]byte(cfg.ToJsonFiltered(model.ConfigAccessTagType, model.ConfigAccessTagCloudRestrictable))) } else { w.Write([]byte(cfg.ToJson()))