From 14607e78d1d6082dc880800427be37529649650f Mon Sep 17 00:00:00 2001 From: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com> Date: Wed, 22 Mar 2023 15:35:17 +0100 Subject: [PATCH] Admin: Change permissions to /admin page so org admins don't get redirected (#65098) --- pkg/api/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 257786d55ae..fac67562ad8 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -102,7 +102,7 @@ func (hs *HTTPServer) registerRoutes() { r.Get("/org/apikeys/", authorize(reqOrgAdmin, ac.EvalPermission(ac.ActionAPIKeyRead)), hs.Index) r.Get("/dashboard/import/", reqSignedIn, hs.Index) r.Get("/configuration", reqGrafanaAdmin, hs.Index) - r.Get("/admin", reqGrafanaAdmin, hs.Index) + r.Get("/admin", reqOrgAdmin, hs.Index) r.Get("/admin/settings", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)), hs.Index) // Show the combined users page for org admins if topnav is enabled if hs.Features.IsEnabled(featuremgmt.FlagTopnav) {