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)
This commit is contained in:
parent
e31c6cfe6e
commit
e88377470a
3 changed files with 23 additions and 0 deletions
|
@ -7,6 +7,7 @@ import (
|
||||||
"code.gitea.io/gitea/models/db"
|
"code.gitea.io/gitea/models/db"
|
||||||
"code.gitea.io/gitea/models/organization"
|
"code.gitea.io/gitea/models/organization"
|
||||||
access_model "code.gitea.io/gitea/models/perm/access"
|
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"
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
"code.gitea.io/gitea/models/unit"
|
"code.gitea.io/gitea/models/unit"
|
||||||
user_model "code.gitea.io/gitea/models/user"
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
@ -134,5 +135,21 @@ func LoadHeaderCount(ctx *context.Context) error {
|
||||||
}
|
}
|
||||||
ctx.Data["RepoCount"] = repoCount
|
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
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,9 @@
|
||||||
{{if .CanReadProjects}}
|
{{if .CanReadProjects}}
|
||||||
<a class="{{if .PageIsViewProjects}}active {{end}}item" href="{{$.Org.HomeLink}}/-/projects">
|
<a class="{{if .PageIsViewProjects}}active {{end}}item" href="{{$.Org.HomeLink}}/-/projects">
|
||||||
{{svg "octicon-project-symlink"}} {{ctx.Locale.Tr "user.projects"}}
|
{{svg "octicon-project-symlink"}} {{ctx.Locale.Tr "user.projects"}}
|
||||||
|
{{if .ProjectCount}}
|
||||||
|
<div class="ui small label">{{.ProjectCount}}</div>
|
||||||
|
{{end}}
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if and .IsPackageEnabled .CanReadPackages}}
|
{{if and .IsPackageEnabled .CanReadPackages}}
|
||||||
|
|
|
@ -13,6 +13,9 @@
|
||||||
{{if or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects)}}
|
{{if or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects)}}
|
||||||
<a href="{{.ContextUser.HomeLink}}/-/projects" class="{{if .PageIsViewProjects}}active {{end}}item">
|
<a href="{{.ContextUser.HomeLink}}/-/projects" class="{{if .PageIsViewProjects}}active {{end}}item">
|
||||||
{{svg "octicon-project-symlink"}} {{ctx.Locale.Tr "user.projects"}}
|
{{svg "octicon-project-symlink"}} {{ctx.Locale.Tr "user.projects"}}
|
||||||
|
{{if .ProjectCount}}
|
||||||
|
<div class="ui small label">{{.ProjectCount}}</div>
|
||||||
|
{{end}}
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if and .IsPackageEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadPackages))}}
|
{{if and .IsPackageEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadPackages))}}
|
||||||
|
|
Loading…
Reference in a new issue