From 58fa119270f66223a01bbddbcd9ffe9ca9b292a1 Mon Sep 17 00:00:00 2001 From: Karl Persson Date: Thu, 12 May 2022 11:46:56 +0200 Subject: [PATCH] sort user permissions by scope (#48928) --- pkg/services/accesscontrol/database/database.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/services/accesscontrol/database/database.go b/pkg/services/accesscontrol/database/database.go index 85f025cfbd4..ec5ef5dbe1c 100644 --- a/pkg/services/accesscontrol/database/database.go +++ b/pkg/services/accesscontrol/database/database.go @@ -48,6 +48,10 @@ func (s *AccessControlStore) GetUserPermissions(ctx context.Context, query acces } } + q += ` + ORDER BY permission.scope + ` + if err := sess.SQL(q, params...).Find(&result); err != nil { return err }