fix

Author: yp05327

models/fixtures/access.yml

@@ -24,150 +24,168 @@
 
 -
   id: 5
+  user_id: 2
+  repo_id: 40
+  mode: 4
+
+-
+  id: 6
+  user_id: 2
+  repo_id: 41
+  mode: 4
+
+-
+  id: 7
   user_id: 4
   repo_id: 3
   mode: 2
 
 -
-  id: 6
+  id: 8
   user_id: 4
   repo_id: 4
   mode: 2
 
 -
-  id: 7
+  id: 9
   user_id: 4
   repo_id: 40
   mode: 2
 
 -
-  id: 8
+  id: 10
+  user_id: 5
+  repo_id: 41
+  mode: 2
+
+-
+  id: 11
   user_id: 10
   repo_id: 21
   mode: 2
 
 -
-  id: 9
+  id: 12
   user_id: 10
   repo_id: 32
   mode: 2
 
 -
-  id: 10
+  id: 13
   user_id: 15
   repo_id: 21
   mode: 2
 
 -
-  id: 11
+  id: 14
   user_id: 15
   repo_id: 22
   mode: 2
 
 -
-  id: 12
+  id: 15
   user_id: 15
   repo_id: 23
   mode: 4
 
 -
-  id: 13
+  id: 16
   user_id: 15
   repo_id: 24
   mode: 4
 
 -
-  id: 14
+  id: 17
   user_id: 15
   repo_id: 32
   mode: 2
 
 -
-  id: 15
+  id: 18
   user_id: 18
   repo_id: 21
   mode: 2
 
 -
-  id: 16
+  id: 19
   user_id: 18
   repo_id: 22
   mode: 2
 
 -
-  id: 17
+  id: 20
   user_id: 18
   repo_id: 23
   mode: 4
 
 -
-  id: 18
+  id: 21
   user_id: 18
   repo_id: 24
   mode: 4
 
 -
-  id: 19
+  id: 22
   user_id: 20
   repo_id: 24
   mode: 1
 
 -
-  id: 20
+  id: 23
   user_id: 20
   repo_id: 27
   mode: 4
 
 -
-  id: 21
+  id: 24
   user_id: 20
   repo_id: 28
   mode: 4
 
 -
-  id: 22
+  id: 25
   user_id: 29
   repo_id: 4
   mode: 2
 
 -
-  id: 23
+  id: 26
   user_id: 29
   repo_id: 24
   mode: 1
 
 -
-  id: 24
+  id: 27
   user_id: 31
   repo_id: 27
   mode: 4
 
 -
-  id: 25
+  id: 28
   user_id: 31
   repo_id: 28
   mode: 4
 
 -
-  id: 26
+  id: 29
   user_id: 38
   repo_id: 60
   mode: 2
 
 -
-  id: 27
+  id: 30
   user_id: 38
   repo_id: 61
   mode: 1
 
 -
-  id: 28
+  id: 31
   user_id: 39
   repo_id: 61
   mode: 1
 
 -
-  id: 29
+  id: 32
   user_id: 40
   repo_id: 61
   mode: 4

models/fixtures/team.yml

@@ -180,7 +180,7 @@
   lower_name: team14writeauth
   name: team14WriteAuth
   authorize: 2 # write
-  num_repos: 0
+  num_repos: 1
   num_members: 1
   includes_all_repositories: false
   can_create_org_repo: true

models/fixtures/team_repo.yml

@@ -85,5 +85,11 @@
 -
   id: 15
   org_id: 23
+  team_id: 17
+  repo_id: 41
+
+-
+  id: 16
+  org_id: 23
   team_id: 23
   repo_id: 41

models/issues/issue_project_test.go

@@ -24,8 +24,8 @@ func Test_LoadIssuesFromBoard(t *testing.T) {
 	user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5})
 	user15 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 15})
 
-	org3 := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3})
 	org17 := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 17})
+	org23 := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 23})
 
 	projectBoard1 := unittest.AssertExistsAndLoadBean(t, &project.Board{ID: 1})
 	projectBoard4 := unittest.AssertExistsAndLoadBean(t, &project.Board{ID: 4})
@@ -87,28 +87,28 @@ func Test_LoadIssuesFromBoard(t *testing.T) {
 			name:   "organization public repo, repo project, org admin",
 			board:  projectBoard5,
 			user:   user15,
-			org:    nil,
+			org:    org17,
 			expect: 1,
 		},
 		{
 			name:   "organization public repo, repo project, member",
 			board:  projectBoard5,
 			user:   user2,
-			org:    nil,
+			org:    org17,
 			expect: 1,
 		},
 		{
 			name:   "organization public repo, repo project, login user",
 			board:  projectBoard5,
 			user:   user3,
-			org:    nil,
+			org:    org17,
 			expect: 1,
 		},
 		{
 			name:   "organization public repo, repo project, non-login",
 			board:  projectBoard5,
 			user:   nil,
-			org:    nil,
+			org:    org17,
 			expect: 1,
 		},
 		{
@@ -143,70 +143,70 @@ func Test_LoadIssuesFromBoard(t *testing.T) {
 			name:   "organization private repo, repo project, org admin",
 			board:  projectBoard7,
 			user:   user2,
-			org:    nil,
+			org:    org23,
 			expect: 1,
 		},
 		{
 			name:   "organization private repo, repo project, member with issue access",
 			board:  projectBoard7,
 			user:   user5,
-			org:    nil,
+			org:    org23,
 			expect: 1,
 		},
 		{
 			name:   "organization private repo, repo project, member without issue access",
 			board:  projectBoard7,
 			user:   user4,
-			org:    nil,
+			org:    org23,
 			expect: 0,
 		},
 		{
 			name:   "organization private repo, repo project, login user",
 			board:  projectBoard7,
 			user:   user3,
-			org:    nil,
+			org:    org23,
 			expect: 0,
 		},
 		{
 			name:   "organization private repo, repo project, non-login",
 			board:  projectBoard7,
 			user:   nil,
-			org:    nil,
+			org:    org23,
 			expect: 0,
 		},
 		{
 			name:   "organization private repo, org project, org admin",
 			board:  projectBoard8,
 			user:   user2,
-			org:    org3,
+			org:    org23,
 			expect: 1,
 		},
 		{
 			name:   "organization private repo, org project, member with issue access",
 			board:  projectBoard8,
 			user:   user5,
-			org:    org3,
+			org:    org23,
 			expect: 1,
 		},
 		{
 			name:   "organization private repo, org project, member without issue access",
 			board:  projectBoard8,
 			user:   user4,
-			org:    org3,
+			org:    org23,
 			expect: 0,
 		},
 		{
 			name:   "organization private repo, org project, login user",
 			board:  projectBoard8,
 			user:   user3,
-			org:    org3,
+			org:    org23,
 			expect: 0,
 		},
 		{
 			name:   "organization private repo, org project, non-login",
 			board:  projectBoard8,
 			user:   nil,
-			org:    org3,
+			org:    org23,
 			expect: 0,
 		},
 	}

models/issues/issue_search.go

@@ -328,7 +328,12 @@ func issuePullAccessibleRepoCond(repoIDstr string, userID int64, org *organizati
 	}
 	if org != nil {
 		if team != nil {
-			cond = cond.And(teamUnitsRepoCond(repoIDstr, userID, org.ID, team.ID, unitType)) // special team member repos
+			cond = cond.And(
+				builder.Or(
+					repo_model.PublicRepoCond(repoIDstr),                            // all public repos
+					teamUnitsRepoCond(repoIDstr, userID, org.ID, team.ID, unitType), // special team member repos
+				),
+			)
 		} else {
 			cond = cond.And(
 				builder.Or(

routers/web/repo/projects.go

@@ -12,6 +12,7 @@ import (
 
 	"code.gitea.io/gitea/models/db"
 	issues_model "code.gitea.io/gitea/models/issues"
+	"code.gitea.io/gitea/models/organization"
 	"code.gitea.io/gitea/models/perm"
 	project_model "code.gitea.io/gitea/models/project"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -319,7 +320,11 @@ func ViewProject(ctx *context.Context) {
 		boards[0].Title = ctx.Locale.TrString("repo.projects.type.uncategorized")
 	}
 
-	issuesMap, err := issues_model.LoadIssuesFromBoardList(ctx, boards, ctx.Doer, nil)
+	var org *organization.Organization
+	if ctx.ContextUser.IsOrganization() {
+		org = (*organization.Organization)(ctx.ContextUser)
+	}
+	issuesMap, err := issues_model.LoadIssuesFromBoardList(ctx, boards, ctx.Doer, org)
 	if err != nil {
 		ctx.ServerError("LoadIssuesOfBoards", err)
 		return