Skip to content

Commit 2cc688f

Browse files
committed
Fix bug
1 parent cf67cb1 commit 2cc688f

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

models/org_team.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -489,15 +489,15 @@ func AddTeamMember(team *organization.Team, userID int64) error {
489489
return err
490490
}
491491

492-
ctx, committer, err := db.TxContext()
493-
if err != nil {
492+
if err := organization.AddOrgUser(team.OrgID, userID); err != nil {
494493
return err
495494
}
496-
defer committer.Close()
497495

498-
if err := AddOrgUser(ctx, team.OrgID, userID); err != nil {
496+
ctx, committer, err := db.TxContext()
497+
if err != nil {
499498
return err
500499
}
500+
defer committer.Close()
501501

502502
sess := db.GetEngine(ctx)
503503

@@ -546,7 +546,8 @@ func AddTeamMember(team *organization.Team, userID int64) error {
546546

547547
// watch could be failed, so run it in a goroutine
548548
if setting.Service.AutoWatchNewRepos {
549-
if err := team.getRepositories(db.GetEngine(db.DefaultContext)); err != nil {
549+
// Get team and its repositories.
550+
if err := team.GetRepositoriesCtx(db.DefaultContext); err != nil {
550551
log.Error("getRepositories failed: %v", err)
551552
}
552553
go func(repos []*repo_model.Repository) {

models/repo_transfer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ func TransferOwnership(doer *user_model.User, newOwnerName string, repo *repo_mo
297297
}
298298

299299
if c.ID != newOwner.ID {
300-
isMember, err := organization.IsOrganizationMember(ctx, newOwner.ID, c.ID)000 repositories)
300+
isMember, err := organization.IsOrganizationMember(ctx, newOwner.ID, c.ID)
301301
if err != nil {
302302
return fmt.Errorf("IsOrgMember: %v", err)
303303
} else if !isMember {

0 commit comments

Comments
 (0)