* RBAC: remove sort and unique values for fetching permissions
(cherry picked from commit e4c45c4f98)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
This commit is contained in:
co-authored by
Karl Persson
parent
10aba4d7ed
commit
7682ecd285
@@ -26,8 +26,7 @@ func (s *AccessControlStore) GetUserPermissions(ctx context.Context, query acces
|
||||
err := s.sql.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
|
||||
filter, params := userRolesFilter(query.OrgID, query.UserID, query.Roles)
|
||||
|
||||
// TODO: optimize this
|
||||
q := `SELECT DISTINCT
|
||||
q := `SELECT
|
||||
permission.action,
|
||||
permission.scope
|
||||
FROM permission
|
||||
@@ -45,10 +44,6 @@ 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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user