Allow non-FGAC fallback to server admin role (#42175)

4 years ago · 143bc5c4ea
parent b7e1f5f9ce
commit 143bc5c4ea
1 changed files with 5 additions and 1 deletions
--- a/public/app/core/services/context_srv.ts
+++ b/public/app/core/services/context_srv.ts
@ -74,7 +74,11 @@ export class ContextSrv {
  }

  hasRole(role: string) {
-    return this.user.orgRole === role;
+    if (role === 'ServerAdmin') {
+      return this.isGrafanaAdmin;
+    } else {
+      return this.user.orgRole === role;
+    }
  }

  accessControlEnabled(): boolean {