mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
AccessControl: Use UIDs for Resource permissions frontend (#95552)
* frontend can use uids to set resource permissions * lint * add uids to folder acl * Update public/app/core/components/Select/UserPicker.tsx Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> * simplify conditions --------- Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
This commit is contained in:
@@ -143,6 +143,7 @@ type UpdateOrgUserCommand struct {
|
||||
type OrgUserDTO struct {
|
||||
OrgID int64 `json:"orgId" xorm:"org_id"`
|
||||
UserID int64 `json:"userId" xorm:"user_id"`
|
||||
UID string `json:"uid" xorm:"uid"`
|
||||
Email string `json:"email"`
|
||||
Name string `json:"name"`
|
||||
AvatarURL string `json:"avatarUrl" xorm:"avatar_url"`
|
||||
|
||||
@@ -602,6 +602,7 @@ func (ss *sqlStore) SearchOrgUsers(ctx context.Context, query *org.SearchOrgUser
|
||||
"org_user.org_id",
|
||||
"org_user.user_id",
|
||||
"u.email",
|
||||
"u.uid",
|
||||
"u.name",
|
||||
"u.login",
|
||||
"org_user.role",
|
||||
|
||||
Reference in New Issue
Block a user