From bd9073a6b61a0c75da7033f8c39cdf39e584ad62 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 6 May 2022 04:52:39 -0400 Subject: [PATCH] fix a bug (#48782) (#48800) (cherry picked from commit 3c78196d0be3c22671b8a92a4f2c8b463abd80eb) Co-authored-by: Ieva --- pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go b/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go index 26b104e2dbe..36ed825e626 100644 --- a/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go +++ b/pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go @@ -197,7 +197,7 @@ func (ac *OSSAccessControlService) GetUserBuiltInRoles(user *models.SignedInUser builtInRoles := []string{string(user.OrgRole)} // With built-in role simplifying, inheritance is performed upon role registration. - if ac.IsDisabled() { + if !ac.features.IsEnabled(featuremgmt.FlagAccesscontrolBuiltins) { for _, br := range user.OrgRole.Children() { builtInRoles = append(builtInRoles, string(br)) }