Browse Source

Fix duplicate entry error when add team member (#19702)

pull/19707/head
zuzuviewer 1 week ago committed by GitHub
parent
commit
77e9346342
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      models/org_team.go
  2. 6
      models/organization/org.go

6
models/org_team.go

@ -496,6 +496,12 @@ func AddTeamMember(team *organization.Team, userID int64) error { @@ -496,6 +496,12 @@ func AddTeamMember(team *organization.Team, userID int64) error {
}
defer committer.Close()
// check in transaction
isAlreadyMember, err = organization.IsTeamMember(ctx, team.OrgID, team.ID, userID)
if err != nil || isAlreadyMember {
return err
}
sess := db.GetEngine(ctx)
if err := db.Insert(ctx, &organization.TeamUser{

6
models/organization/org.go

@ -594,6 +594,12 @@ func AddOrgUser(orgID, uid int64) error { @@ -594,6 +594,12 @@ func AddOrgUser(orgID, uid int64) error {
}
defer committer.Close()
// check in transaction
isAlreadyMember, err = IsOrganizationMember(ctx, orgID, uid)
if err != nil || isAlreadyMember {
return err
}
ou := &OrgUser{
UID: uid,
OrgID: orgID,

Loading…
Cancel
Save