public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

teams: bugfix, user pointer.

Browse Source
This commit is contained in:
Leonard Gram
2019-03-19 13:57:27 +01:00
parent 90e9fda90c
commit 319879cfa8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/teams/team.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
m "github.com/grafana/grafana/pkg/models"
)
func canUpdateTeam(orgId int64, teamId int64, user m.SignedInUser) error {
func canUpdateTeam(orgId int64, teamId int64, user *m.SignedInUser) error {
if user.OrgRole == m.ROLE_ADMIN {
return nil
}
@@ -36,7 +36,7 @@ func canUpdateTeam(orgId int64, teamId int64, user m.SignedInUser) error {
return m.ErrNotAllowedToUpdateTeam
}
func UpdateTeam(user m.SignedInUser, cmd *m.UpdateTeamCommand) error {
func UpdateTeam(user *m.SignedInUser, cmd *m.UpdateTeamCommand) error {
if err := canUpdateTeam(cmd.OrgId, cmd.Id, user); err != nil {
return err
}
pkg/services/teams/teams_test.go
+4 -4
View File
@@ -32,7 +32,7 @@ func TestUpdateTeam(t *testing.T) {
return nil
})
err := UpdateTeam(editor, &cmd)
err := UpdateTeam(&editor, &cmd)
So(err, ShouldEqual, m.ErrNotAllowedToUpdateTeam)
})
@@ -73,7 +73,7 @@ func TestUpdateTeam(t *testing.T) {
return nil
})
err := UpdateTeam(editor, &cmd)
err := UpdateTeam(&editor, &cmd)
So(teamUpdated, ShouldBeTrue)
So(err, ShouldBeNil)
@@ -111,7 +111,7 @@ func TestUpdateTeam(t *testing.T) {
return nil
})
err := UpdateTeam(editor, &cmd)
err := UpdateTeam(&editor, &cmd)
So(err, ShouldEqual, m.ErrNotAllowedToUpdateTeamInDifferentOrg)
})
@@ -142,7 +142,7 @@ func TestUpdateTeam(t *testing.T) {
return nil
})
err := UpdateTeam(editor, &cmd)
err := UpdateTeam(&editor, &cmd)
So(teamUpdated, ShouldBeTrue)
So(err, ShouldBeNil)