From e88377470a05f7b57a5f421f7af7c03ed66e7983 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 18 Nov 2023 12:02:42 +0900 Subject: [PATCH] Fix project counter in organization/individual profile (#28068) Fix #28052 Before: ![image](https://github.com/go-gitea/gitea/assets/18380374/5f299983-4b38-4d68-ac0e-4be3c62c0558) ![image](https://github.com/go-gitea/gitea/assets/18380374/f0e12afd-483b-4882-80e9-0261beb3fe0c) After: ![image](https://github.com/go-gitea/gitea/assets/18380374/47cccb7b-bb35-4a7d-9c5b-83133be0323a) ![image](https://github.com/go-gitea/gitea/assets/18380374/77825c0c-4bf2-4762-83a2-1a5a173cc22d) --- routers/web/shared/user/header.go | 17 +++++++++++++++++ templates/org/menu.tmpl | 3 +++ templates/user/overview/header.tmpl | 3 +++ 3 files changed, 23 insertions(+) diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 3a83722ef7..998a0c896b 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -7,6 +7,7 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" access_model "code.gitea.io/gitea/models/perm/access" + project_model "code.gitea.io/gitea/models/project" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" @@ -134,5 +135,21 @@ func LoadHeaderCount(ctx *context.Context) error { } ctx.Data["RepoCount"] = repoCount + var projectType project_model.Type + if ctx.ContextUser.IsOrganization() { + projectType = project_model.TypeOrganization + } else { + projectType = project_model.TypeIndividual + } + projectCount, err := project_model.CountProjects(ctx, project_model.SearchOptions{ + OwnerID: ctx.ContextUser.ID, + IsClosed: util.OptionalBoolOf(false), + Type: projectType, + }) + if err != nil { + return err + } + ctx.Data["ProjectCount"] = projectCount + return nil } diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index c3ec142e9c..8a97711ce2 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -9,6 +9,9 @@ {{if .CanReadProjects}} {{svg "octicon-project-symlink"}} {{ctx.Locale.Tr "user.projects"}} + {{if .ProjectCount}} +
{{.ProjectCount}}
+ {{end}}
{{end}} {{if and .IsPackageEnabled .CanReadPackages}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 94d06234fa..c0cbe2561c 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -13,6 +13,9 @@ {{if or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects)}} {{svg "octicon-project-symlink"}} {{ctx.Locale.Tr "user.projects"}} + {{if .ProjectCount}} +
{{.ProjectCount}}
+ {{end}}
{{end}} {{if and .IsPackageEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadPackages))}}