From 4ef0a905def6fc4a849af61c273c7092b561fa96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=98=99=E2=97=A6=20The=20Tablet=20=E2=9D=80=20GamerGirla?= =?UTF-8?q?ndCo=20=E2=97=A6=E2=9D=A7?= Date: Thu, 9 Jan 2025 19:10:51 -0500 Subject: [PATCH] [models] update `GetTeamRepositories` to also return repositories accessible via group permissions --- models/repo/org_repo.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/models/repo/org_repo.go b/models/repo/org_repo.go index 96f21ba2ac..f56c3146c2 100644 --- a/models/repo/org_repo.go +++ b/models/repo/org_repo.go @@ -30,10 +30,13 @@ type SearchTeamRepoOptions struct { func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) (RepositoryList, error) { sess := db.GetEngine(ctx) if opts.TeamID > 0 { - sess = sess.In("id", - builder.Select("repo_id"). - From("team_repo"). - Where(builder.Eq{"team_id": opts.TeamID}), + sess = sess.Where( + builder.Or( + builder.In("id", builder.Select("repo_id"). + From("team_repo"). + Where(builder.Eq{"team_id": opts.TeamID}), + )), + builder.In("id", ReposAccessibleByGroupTeamBuilder(opts.TeamID)), ) } if opts.PageSize > 0 {