Browse Source

fix issue stats with milestone filter

Unknwon 9 years ago
parent
commit
34795770c3
2 changed files with 5 additions and 2 deletions
  1. 4 1
      models/issue.go
  2. 1 1
      routers/repo/issue.go

+ 4 - 1
models/issue.go

@@ -426,7 +426,7 @@ const (
 )
 
 // GetIssueStats returns issue statistic information by given conditions.
-func GetIssueStats(repoID, uid, labelID int64, isShowClosed bool, filterMode int) *IssueStats {
+func GetIssueStats(repoID, uid, labelID, milestoneID int64, isShowClosed bool, filterMode int) *IssueStats {
 	stats := &IssueStats{}
 	issue := new(Issue)
 
@@ -434,6 +434,9 @@ func GetIssueStats(repoID, uid, labelID int64, isShowClosed bool, filterMode int
 	if labelID > 0 {
 		queryStr += " AND issue.label_ids like '%$" + com.ToStr(labelID) + "|%'"
 	}
+	if milestoneID > 0 {
+		queryStr += " AND milestone_id=" + com.ToStr(milestoneID)
+	}
 	switch filterMode {
 	case FM_ALL:
 		stats.OpenCount, _ = x.Where(queryStr, repoID, false).Count(issue)

+ 1 - 1
routers/repo/issue.go

@@ -95,7 +95,7 @@ func Issues(ctx *middleware.Context) {
 	selectLabels := ctx.Query("labels")
 	milestoneID := ctx.QueryInt64("milestone")
 	isShowClosed := ctx.Query("state") == "closed"
-	issueStats := models.GetIssueStats(repo.Id, uid, com.StrTo(selectLabels).MustInt64(), isShowClosed, filterMode)
+	issueStats := models.GetIssueStats(repo.Id, uid, com.StrTo(selectLabels).MustInt64(), milestoneID, isShowClosed, filterMode)
 
 	page := ctx.QueryInt("page")
 	if page <= 1 {