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

teams: cleanup.

Browse Source
This commit is contained in:
Leonard Gram
2019-03-13 16:32:59 +01:00
parent fc0461134f
commit ccfd6789ca
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/models/team_member.go
View File

@@ -64,13 +64,13 @@ type GetTeamMembersQuery struct {
// Projections and DTOs // Projections and DTOs
type TeamMemberDTO struct { type TeamMemberDTO struct {
OrgId int64 `json:"orgId"` OrgId int64 `json:"orgId"`
TeamId int64 `json:"teamId"` TeamId int64 `json:"teamId"`
UserId int64 `json:"userId"` UserId int64 `json:"userId"`
External bool `json:"-"` External bool `json:"-"`
Email string `json:"email"` Email string `json:"email"`
Login string `json:"login"` Login string `json:"login"`
AvatarUrl string `json:"avatarUrl"` AvatarUrl string `json:"avatarUrl"`
Labels []string `json:"labels"` Labels []string `json:"labels"`
Permission int64 `json:"permission"` Permission PermissionType `json:"permission"`
} }

2
pkg/services/teamguardian/team.go
View File

@@ -25,7 +25,7 @@ func CanAdmin(orgId int64, teamId int64, user *m.SignedInUser) error {
} }
for _, member := range cmd.Result { for _, member := range cmd.Result {
if member.UserId == user.UserId && member.Permission == int64(m.PERMISSION_ADMIN) { if member.UserId == user.UserId && member.Permission == m.PERMISSION_ADMIN {
return nil return nil
} }
} }

4
pkg/services/teamguardian/teams_test.go
View File

@@ -45,7 +45,7 @@ func TestUpdateTeam(t *testing.T) {
OrgId: testTeam.OrgId, OrgId: testTeam.OrgId,
TeamId: testTeam.Id, TeamId: testTeam.Id,
UserId: editor.UserId, UserId: editor.UserId,
Permission: int64(m.PERMISSION_ADMIN), Permission: m.PERMISSION_ADMIN,
}} }}
return nil return nil
}) })
@@ -67,7 +67,7 @@ func TestUpdateTeam(t *testing.T) {
OrgId: testTeamOtherOrg.OrgId, OrgId: testTeamOtherOrg.OrgId,
TeamId: testTeamOtherOrg.Id, TeamId: testTeamOtherOrg.Id,
UserId: editor.UserId, UserId: editor.UserId,
Permission: int64(m.PERMISSION_ADMIN), Permission: m.PERMISSION_ADMIN,
}} }}
return nil return nil
}) })