worldcone/forgejo
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use the total issue count for UI (#20785)

Browse source 
* Use the total issue count for UI

This fixes a problem where the "All" line item on the Issues or Pull Requests page was only showing the count of the selected repos instead of the total of all issues/prs in all repos.

The "total number of shown issues" number is now stashed in a different context variable in case it wants to be used by the frontend later. It's currently not being used.

Fixes #20574

* Remove unused context variable

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
parnic 2022-08-17 08:13:41 -05:00 committed by GitHub
parent a4e91c4197
commit 7503cd35c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
routers/web/user/home.go
View file

@ -607,10 +607,8 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
var shownIssues int var shownIssues int
if !isShowClosed { if !isShowClosed {
shownIssues = int(issueStats.OpenCount) shownIssues = int(issueStats.OpenCount)
ctx.Data["TotalIssueCount"] = shownIssues
} else { } else {
shownIssues = int(issueStats.ClosedCount) shownIssues = int(issueStats.ClosedCount)
ctx.Data["TotalIssueCount"] = shownIssues
} }
if len(repoIDs) != 0 { if len(repoIDs) != 0 {
shownIssues = 0 shownIssues = 0
@ -618,6 +616,13 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
shownIssues += int(issueCountByRepo[repoID]) shownIssues += int(issueCountByRepo[repoID])
} }
} }
var allIssueCount int64
for _, issueCount := range issueCountByRepo {
allIssueCount += issueCount
}
ctx.Data["TotalIssueCount"] = allIssueCount
if len(repoIDs) == 1 { if len(repoIDs) == 1 {
repo := showReposMap[repoIDs[0]] repo := showReposMap[repoIDs[0]]
if repo != nil { if repo != nil {