core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
zuzuviewer 2022-05-14 21:30:19 +08:00 committed by GitHub
parent b135313c47
commit 77e9346342
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
models/org_team.go
View File

@ -496,6 +496,12 @@ func AddTeamMember(team *organization.Team, userID int64) error {
} }
defer committer.Close() 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) sess := db.GetEngine(ctx)
if err := db.Insert(ctx, &organization.TeamUser{ if err := db.Insert(ctx, &organization.TeamUser{

6
models/organization/org.go
View File

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