From 2e7b38db9f0089b2c0af9ae81a969fe03b799a40 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 25 Jul 2015 13:07:00 +0800 Subject: fix paging links and issue count --- models/issue.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'models') diff --git a/models/issue.go b/models/issue.go index 03a8a52e..e0265924 100644 --- a/models/issue.go +++ b/models/issue.go @@ -412,7 +412,10 @@ func GetIssueStats(repoID, uid, labelID int64, isShowClosed bool, filterMode int stats := &IssueStats{} issue := new(Issue) - queryStr := "repo_id=? AND is_closed=?" + queryStr := "issue.repo_id=? AND issue.is_closed=?" + if labelID > 0 { + queryStr += " AND issue.label_ids like '%$" + com.ToStr(labelID) + "|%'" + } switch filterMode { case FM_ALL: stats.OpenCount, _ = x.Where(queryStr, repoID, false).Count(issue) @@ -433,6 +436,15 @@ func GetIssueStats(repoID, uid, labelID int64, isShowClosed bool, filterMode int case FM_MENTION: queryStr += " AND uid=? AND is_mentioned=?" + if labelID > 0 { + stats.OpenCount, _ = x.Where(queryStr, repoID, false, uid, true). + Join("INNER", "issue", "issue.id = issue_id").Count(new(IssueUser)) + stats.ClosedCount, _ = x.Where(queryStr, repoID, true, uid, true). + Join("INNER", "issue", "issue.id = issue_id").Count(new(IssueUser)) + return stats + } + + queryStr = strings.Replace(queryStr, "issue.", "", 2) stats.OpenCount, _ = x.Where(queryStr, repoID, false, uid, true).Count(new(IssueUser)) stats.ClosedCount, _ = x.Where(queryStr, repoID, true, uid, true).Count(new(IssueUser)) return stats -- cgit v1.2.3