public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Access control: Rename predefined roles to fixed roles (code) (#34469)

Browse Source 
* s/grafana:roles:/fixed:/

* Update free text references to predefined roles
This commit is contained in:
Emil Tullstedt
2021-05-25 15:36:01 +02:00
committed by GitHub
parent b74a502dc4
commit 0f4806db8a
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/accesscontrol/ossaccesscontrol/ossaccesscontrol.go
+2 -2
View File
@@ -62,9 +62,9 @@ func (ac *OSSAccessControlService) GetUserPermissions(ctx context.Context, user
builtinRoles := ac.GetUserBuiltInRoles(user)
permissions := make([]*accesscontrol.Permission, 0)
for _, builtin := range builtinRoles {
if roleNames, ok := accesscontrol.PredefinedRoleGrants[builtin]; ok {
if roleNames, ok := accesscontrol.FixedRoleGrants[builtin]; ok {
for _, name := range roleNames {
r, exists := accesscontrol.PredefinedRoles[name]
r, exists := accesscontrol.FixedRoles[name]
if !exists {
continue
}