IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

teams: cleanup.

Browse Source
This commit is contained in:
Leonard Gram
2019-03-19 13:57:30 +01:00
parent 0b209de5d1
commit a6a3d698da
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/team.go
+4 -10
View File
@@ -92,10 +92,8 @@ func UpdateTeam(cmd *m.UpdateTeamCommand) error {
// DeleteTeam will delete a team, its member and any permissions connected to the team // DeleteTeam will delete a team, its member and any permissions connected to the team
func DeleteTeam(cmd *m.DeleteTeamCommand) error { func DeleteTeam(cmd *m.DeleteTeamCommand) error {
return inTransaction(func(sess *DBSession) error { return inTransaction(func(sess *DBSession) error {
if teamExists, err := teamExists(cmd.OrgId, cmd.Id, sess); err != nil { if _, err := teamExists(cmd.OrgId, cmd.Id, sess); err != nil {
return err return err
} else if !teamExists {
return m.ErrTeamNotFound
} }
deletes := []string{ deletes := []string{
@@ -118,7 +116,7 @@ func teamExists(orgId int64, teamId int64, sess *DBSession) (bool, error) {
if res, err := sess.Query("SELECT 1 from team WHERE org_id=? and id=?", orgId, teamId); err != nil { if res, err := sess.Query("SELECT 1 from team WHERE org_id=? and id=?", orgId, teamId); err != nil {
return false, err return false, err
} else if len(res) != 1 { } else if len(res) != 1 {
return false, nil return false, m.ErrTeamNotFound
} }
return true, nil return true, nil
@@ -238,10 +236,8 @@ func AddTeamMember(cmd *m.AddTeamMemberCommand) error {
return m.ErrTeamMemberAlreadyAdded return m.ErrTeamMemberAlreadyAdded
} }
if teamExists, err := teamExists(cmd.OrgId, cmd.TeamId, sess); err != nil { if _, err := teamExists(cmd.OrgId, cmd.TeamId, sess); err != nil {
return err return err
} else if !teamExists {
return m.ErrTeamNotFound
} }
entity := m.TeamMember{ entity := m.TeamMember{
@@ -285,10 +281,8 @@ func UpdateTeamMember(cmd *m.UpdateTeamMemberCommand) error {
// RemoveTeamMember removes a member from a team // RemoveTeamMember removes a member from a team
func RemoveTeamMember(cmd *m.RemoveTeamMemberCommand) error { func RemoveTeamMember(cmd *m.RemoveTeamMemberCommand) error {
return inTransaction(func(sess *DBSession) error { return inTransaction(func(sess *DBSession) error {
if teamExists, err := teamExists(cmd.OrgId, cmd.TeamId, sess); err != nil { if _, err := teamExists(cmd.OrgId, cmd.TeamId, sess); err != nil {
return err return err
} else if !teamExists {
return m.ErrTeamNotFound
} }
var rawSql = "DELETE FROM team_member WHERE org_id=? and team_id=? and user_id=?" var rawSql = "DELETE FROM team_member WHERE org_id=? and team_id=? and user_id=?"
pkg/services/teams/team.go
-2
View File
@@ -18,8 +18,6 @@ func CanUpdateTeam(orgId int64, teamId int64, user *m.SignedInUser) error {
OrgId: orgId, OrgId: orgId,
TeamId: teamId, TeamId: teamId,
UserId: user.UserId, UserId: user.UserId,
// TODO: do we need to do something special about external users
// External: false,
} }
if err := bus.Dispatch(&cmd); err != nil { if err := bus.Dispatch(&cmd); err != nil {