Use the total issue count for UI (#20785)
* 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:
parent
a4e91c4197
commit
7503cd35c2
1 changed files with 7 additions and 2 deletions
|
@ -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 {
|
||||||
|
|
Reference in a new issue