IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move role types to a separate package (#55665)

Browse Source 
* Move role types to a separate package

* Make role type singular and remove _ from directory name
This commit is contained in:
idafurjes
2022-09-23 12:40:02 +02:00
committed by GitHub
parent 3eaeffda07
commit 7f98f4b411
3 changed files with 75 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/user/model.go
View File

@@ -6,7 +6,7 @@ import (
"strings"
"time"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/models/roletype"
)
type HelpFlags1 uint64
@@ -196,7 +196,7 @@ type SignedInUser struct {
UserID int64 `xorm:"user_id"`
OrgID int64 `xorm:"org_id"`
OrgName string
OrgRole org.RoleType
OrgRole roletype.RoleType
ExternalAuthModule string
ExternalAuthID string
Login string
@@ -268,7 +268,7 @@ func (u *SignedInUser) ToUserDisplayDTO() *UserDisplayDTO {
}
}
func (u *SignedInUser) HasRole(role org.RoleType) bool {
func (u *SignedInUser) HasRole(role roletype.RoleType) bool {
if u.IsGrafanaAdmin {
return true
}