diff options
Diffstat (limited to 'internal/db/org_team.go')
| -rw-r--r-- | internal/db/org_team.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/internal/db/org_team.go b/internal/db/org_team.go index f5309888..6e141d25 100644 --- a/internal/db/org_team.go +++ b/internal/db/org_team.go @@ -241,11 +241,12 @@ func NewTeam(t *Team) error { } t.LowerName = strings.ToLower(t.Name) - has, err = x.Where("org_id=?", t.OrgID).And("lower_name=?", t.LowerName).Get(new(Team)) + existingTeam := Team{} + has, err = x.Where("org_id=?", t.OrgID).And("lower_name=?", t.LowerName).Get(&existingTeam) if err != nil { return err } else if has { - return ErrTeamAlreadyExist{t.OrgID, t.LowerName} + return ErrTeamAlreadyExist{existingTeam.ID, t.OrgID, t.LowerName} } sess := x.NewSession() @@ -346,11 +347,12 @@ func UpdateTeam(t *Team, authChanged bool) (err error) { } t.LowerName = strings.ToLower(t.Name) - has, err := x.Where("org_id=?", t.OrgID).And("lower_name=?", t.LowerName).And("id!=?", t.ID).Get(new(Team)) + existingTeam := new(Team) + has, err := x.Where("org_id=?", t.OrgID).And("lower_name=?", t.LowerName).And("id!=?", t.ID).Get(&existingTeam) if err != nil { return err } else if has { - return ErrTeamAlreadyExist{t.OrgID, t.LowerName} + return ErrTeamAlreadyExist{existingTeam.ID, t.OrgID, t.LowerName} } if _, err = sess.ID(t.ID).AllCols().Update(t); err != nil { |