Merge

go-gitea · May 20, 2022 · a46f842 · a46f842
1 parent eba0476
commit a46f842
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/models/organization/org_user_test.go b/models/organization/org_user_test.go
@@ -91,7 +91,7 @@ func TestUserListIsPublicMember(t *testing.T) {
 }
 
 func testUserListIsPublicMember(t *testing.T, orgID int64, expected map[int64]bool) {
-	org, err := GetOrgByID(orgID)
+	org, err := GetOrgByID(db.DefaultContext, orgID)
 	assert.NoError(t, err)
 	_, membersIsPublic, err := org.GetMembers()
 	assert.NoError(t, err)
@@ -118,7 +118,7 @@ func TestUserListIsUserOrgOwner(t *testing.T) {
 }
 
 func testUserListIsUserOrgOwner(t *testing.T, orgID int64, expected map[int64]bool) {
-	org, err := GetOrgByID(orgID)
+	org, err := GetOrgByID(db.DefaultContext, orgID)
 	assert.NoError(t, err)
 	members, _, err := org.GetMembers()
 	assert.NoError(t, err)

diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go
@@ -1214,8 +1214,8 @@ func selectPushMirrorByForm(form *forms.RepoSettingForm, repo *repo_model.Reposi
 	}
 
 	for _, m := range pushMirrors {
-		m.Repo = repo
 		if m.ID == id {
+			m.Repo = repo
 			return m, nil
 		}
 	}