From 2cc688f3c5fd8ef33da2bba580c76d6a24c5670a Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Fri, 1 Apr 2022 09:28:43 +0800
Subject: [PATCH] Fix bug

---
 models/org_team.go      | 11 ++++++-----
 models/repo_transfer.go |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/models/org_team.go b/models/org_team.go
index 610c0fc0ecbc..695f803dbfdb 100644
--- a/models/org_team.go
+++ b/models/org_team.go
@@ -489,15 +489,15 @@ func AddTeamMember(team *organization.Team, userID int64) error {
 		return err
 	}
 
-	ctx, committer, err := db.TxContext()
-	if err != nil {
+	if err := organization.AddOrgUser(team.OrgID, userID); err != nil {
 		return err
 	}
-	defer committer.Close()
 
-	if err := AddOrgUser(ctx, team.OrgID, userID); err != nil {
+	ctx, committer, err := db.TxContext()
+	if err != nil {
 		return err
 	}
+	defer committer.Close()
 
 	sess := db.GetEngine(ctx)
 
@@ -546,7 +546,8 @@ func AddTeamMember(team *organization.Team, userID int64) error {
 
 	// watch could be failed, so run it in a goroutine
 	if setting.Service.AutoWatchNewRepos {
-		if err := team.getRepositories(db.GetEngine(db.DefaultContext)); err != nil {
+		// Get team and its repositories.
+		if err := team.GetRepositoriesCtx(db.DefaultContext); err != nil {
 			log.Error("getRepositories failed: %v", err)
 		}
 		go func(repos []*repo_model.Repository) {
diff --git a/models/repo_transfer.go b/models/repo_transfer.go
index e1316d464672..f9a758a20ba7 100644
--- a/models/repo_transfer.go
+++ b/models/repo_transfer.go
@@ -297,7 +297,7 @@ func TransferOwnership(doer *user_model.User, newOwnerName string, repo *repo_mo
 		}
 
 		if c.ID != newOwner.ID {
-			isMember, err := organization.IsOrganizationMember(ctx, newOwner.ID, c.ID)000 repositories)
+			isMember, err := organization.IsOrganizationMember(ctx, newOwner.ID, c.ID)
 			if err != nil {
 				return fmt.Errorf("IsOrgMember: %v", err)
 			} else if !isMember {