Skip to content

Commit 36b9a86

Browse files
GiteaBotyp05327
andauthored
Fix incorrect milestone count when provide a keyword (go-gitea#25880) (go-gitea#25904)
Backport go-gitea#25880 by @yp05327 You can confirm this issue in: https://try.gitea.io/yp05327/testrepo/milestones?state=open&q=a There's no milestone, but the count is 1. ![image](https://github.com/go-gitea/gitea/assets/18380374/25e58cee-aeeb-43c1-8ec8-6e2ec6bf1284) Co-authored-by: yp05327 <576951401@qq.com>
1 parent e627f16 commit 36b9a86

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

routers/web/repo/milestone.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,8 @@ func Milestones(ctx *context.Context) {
3838
ctx.Data["PageIsMilestones"] = true
3939

4040
isShowClosed := ctx.FormString("state") == "closed"
41-
stats, err := issues_model.GetMilestonesStatsByRepoCond(builder.And(builder.Eq{"id": ctx.Repo.Repository.ID}))
42-
if err != nil {
43-
ctx.ServerError("MilestoneStats", err)
44-
return
45-
}
46-
ctx.Data["OpenCount"] = stats.OpenCount
47-
ctx.Data["ClosedCount"] = stats.ClosedCount
48-
4941
sortType := ctx.FormString("sort")
50-
5142
keyword := ctx.FormTrim("q")
52-
5343
page := ctx.FormInt("page")
5444
if page <= 1 {
5545
page = 1
@@ -74,6 +64,15 @@ func Milestones(ctx *context.Context) {
7464
ctx.ServerError("GetMilestones", err)
7565
return
7666
}
67+
68+
stats, err := issues_model.GetMilestonesStatsByRepoCondAndKw(builder.And(builder.Eq{"id": ctx.Repo.Repository.ID}), keyword)
69+
if err != nil {
70+
ctx.ServerError("GetMilestoneStats", err)
71+
return
72+
}
73+
ctx.Data["OpenCount"] = stats.OpenCount
74+
ctx.Data["ClosedCount"] = stats.ClosedCount
75+
7776
if ctx.Repo.Repository.IsTimetrackerEnabled(ctx) {
7877
if err := miles.LoadTotalTrackedTimes(); err != nil {
7978
ctx.ServerError("LoadTotalTrackedTimes", err)

0 commit comments

Comments
 (0)