tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-04-08 17:05:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show Org-level Project in Repo-projects list

Browse Source
This commit is contained in:
jerryyummy 2025-03-08 23:47:13 -08:00
parent 3f1f808b9e
commit dcf2ae524b
1 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
routers/web/repo/projects.go
View File

@ -62,13 +62,11 @@ func Projects(ctx *context.Context) {
keyword := ctx.FormTrim("q")
repo := ctx.Repo.Repository
page := ctx.FormInt("page")
ownerID := repo.OwnerID
if page <= 1 {
page = 1
}
ctx.Data["OpenCount"] = repo.NumOpenProjects
ctx.Data["ClosedCount"] = repo.NumClosedProjects
var total int
if !isShowClosed {
total = repo.NumOpenProjects
@ -76,7 +74,9 @@ func Projects(ctx *context.Context) {
total = repo.NumClosedProjects
}
projects, count, err := db.FindAndCount[project_model.Project](ctx, project_model.SearchOptions{
projects := make([]*project_model.Project, 0, total)
repoProjects, count, err := db.FindAndCount[project_model.Project](ctx, project_model.SearchOptions{
ListOptions: db.ListOptions{
PageSize: setting.UI.IssuePagingNum,
Page: page,
@ -88,10 +88,59 @@ func Projects(ctx *context.Context) {
Title: keyword,
})
if err != nil {
ctx.ServerError("GetProjects", err)
ctx.ServerError("GetRepoProjects", err)
return
}
projects = append(projects, repoProjects...)
openOrgProjects, openCountForOrgProjects, err := db.FindAndCount[project_model.Project](ctx, project_model.SearchOptions{
ListOptions: db.ListOptions{
PageSize: setting.UI.IssuePagingNum,
Page: page,
},
OwnerID: ownerID,
IsClosed: optional.Some(false),
OrderBy: project_model.GetSearchOrderByBySortType(sortType),
Type: project_model.TypeOrganization,
Title: keyword,
})
if err != nil {
ctx.ServerError("GetOrgProjects", err)
return
}
closeOrgProjects, closeCountForOrgProjects, err := db.FindAndCount[project_model.Project](ctx, project_model.SearchOptions{
ListOptions: db.ListOptions{
PageSize: setting.UI.IssuePagingNum,
Page: page,
},
OwnerID: ownerID,
IsClosed: optional.Some(true),
OrderBy: project_model.GetSearchOrderByBySortType(sortType),
Type: project_model.TypeOrganization,
Title: keyword,
})
if err != nil {
ctx.ServerError("GetOrgProjects", err)
return
}
if isShowClosed {
count += closeCountForOrgProjects
total += int(closeCountForOrgProjects)
projects = append(projects, closeOrgProjects...)
} else {
count += openCountForOrgProjects
total += int(openCountForOrgProjects)
projects = append(projects, openOrgProjects...)
}
totalOpenCount := repo.NumOpenProjects + int(openCountForOrgProjects)
totalCloseCount := repo.NumClosedProjects + int(closeCountForOrgProjects)
ctx.Data["OpenCount"] = totalOpenCount
ctx.Data["ClosedCount"] = totalCloseCount
if err := project_service.LoadIssueNumbersForProjects(ctx, projects, ctx.Doer); err != nil {
ctx.ServerError("LoadIssueNumbersForProjects", err)
return