mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
AccessControl: don't pull builtin role assignments when refactor is enabled (#48675)
This commit is contained in:
parent
02aa1cd1c5
commit
8ed3fb1f2d
@ -112,6 +112,10 @@ export class ContextSrv {
|
||||
return Boolean(config.featureToggles['accesscontrol']);
|
||||
}
|
||||
|
||||
accessControlBuiltinRefactorEnabled(): boolean {
|
||||
return Boolean(config.featureToggles['accesscontrol-builtins']);
|
||||
}
|
||||
|
||||
licensedAccessControlEnabled(): boolean {
|
||||
return featureEnabled('accesscontrol') && Boolean(config.featureToggles['accesscontrol']);
|
||||
}
|
||||
|
@ -32,6 +32,7 @@ export function fetchACOptions(): ThunkResult<void> {
|
||||
dispatch(acOptionsLoaded(options));
|
||||
}
|
||||
if (
|
||||
!contextSrv.accessControlBuiltinRefactorEnabled() &&
|
||||
contextSrv.licensedAccessControlEnabled() &&
|
||||
contextSrv.hasPermission(AccessControlAction.ActionBuiltinRolesList)
|
||||
) {
|
||||
|
@ -30,7 +30,10 @@ const UsersTable: FC<Props> = (props) => {
|
||||
setRoleOptions(options);
|
||||
}
|
||||
|
||||
if (contextSrv.hasPermission(AccessControlAction.ActionBuiltinRolesList)) {
|
||||
if (
|
||||
!contextSrv.accessControlBuiltinRefactorEnabled() &&
|
||||
contextSrv.hasPermission(AccessControlAction.ActionBuiltinRolesList)
|
||||
) {
|
||||
const builtInRoles = await fetchBuiltinRoles(orgId);
|
||||
setBuiltinRoles(builtInRoles);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user