From ff8e88f8c9f50d2b3045d74058896ce0bd0f5b0f Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 16:31:30 +0300 Subject: [PATCH] [v10.1.x] RBAC: Fix search user permissions (#74837) RBAC: Fix search user permissions (#74729) Co-authored-by: Alexander Zobnin (cherry picked from commit 729f9a01a04ee6129836158078e64c738f46c293) Co-authored-by: Gabriel MABILLE --- pkg/services/accesscontrol/database/database.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/accesscontrol/database/database.go b/pkg/services/accesscontrol/database/database.go index 612fa2651c6..02c709734d1 100644 --- a/pkg/services/accesscontrol/database/database.go +++ b/pkg/services/accesscontrol/database/database.go @@ -78,7 +78,7 @@ func (s *AccessControlStore) SearchUsersPermissions(ctx context.Context, orgID i INNER JOIN team_role AS tr ON tr.role_id = p.role_id INNER JOIN team_member AS tm ON tm.team_id = tr.team_id UNION ALL - SELECT ou.user_id, br.org_id, p.action, p.scope + SELECT ou.user_id, ou.org_id, p.action, p.scope FROM permission AS p INNER JOIN builtin_role AS br ON br.role_id = p.role_id INNER JOIN org_user AS ou ON ou.role = br.role