RBAC: Remove builtin role code (#53767)
* remove rbacBuiltInRoleAssignmentEnabled from frontendsettings * RBAC: Remove RBACBuiltInRoleAssignmentEnabled * RBAC: Remove code for builtin role * RolePicker: Remove unused prop * RolePicker: Rename builtinRole to basicRole * RolePicker: Rename onBuiltinRoleChange to onBasicRoleChange * RolePicker: Rename properties
This commit is contained in:
@@ -272,16 +272,9 @@ func IsDisabled(cfg *setting.Cfg) bool {
|
||||
}
|
||||
|
||||
// GetOrgRoles returns legacy org roles for a user
|
||||
func GetOrgRoles(cfg *setting.Cfg, user *user.SignedInUser) []string {
|
||||
func GetOrgRoles(user *user.SignedInUser) []string {
|
||||
roles := []string{string(user.OrgRole)}
|
||||
|
||||
// With built-in role simplifying, inheritance is performed upon role registration.
|
||||
if cfg.RBACBuiltInRoleAssignmentEnabled {
|
||||
for _, br := range user.OrgRole.Children() {
|
||||
roles = append(roles, string(br))
|
||||
}
|
||||
}
|
||||
|
||||
if user.IsGrafanaAdmin {
|
||||
roles = append(roles, RoleGrafanaAdmin)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user