From 987dcc5372998adaafb68e00a9a460e955d018e5 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 20 Nov 2015 02:38:41 -0500 Subject: fix #1383 --- models/issue.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'models/issue.go') diff --git a/models/issue.go b/models/issue.go index 077e945c..9329f9b5 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1375,8 +1375,8 @@ func ChangeMilestoneAssign(oldMid int64, issue *Issue) (err error) { } // DeleteMilestoneByID deletes a milestone by given ID. -func DeleteMilestoneByID(mid int64) error { - m, err := GetMilestoneByID(mid) +func DeleteMilestoneByID(id int64) error { + m, err := GetMilestoneByID(id) if err != nil { if IsErrMilestoneNotExist(err) { return nil -- cgit v1.2.3 From b4877b1e067f7d6e0a08ff6c79bfc096d32c1331 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 21 Nov 2015 14:02:37 -0500 Subject: fix for #2012 --- models/issue.go | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'models/issue.go') diff --git a/models/issue.go b/models/issue.go index 9329f9b5..cee8c36a 100644 --- a/models/issue.go +++ b/models/issue.go @@ -718,32 +718,28 @@ func GetIssueStats(opts *IssueStatsOptions) *IssueStats { if opts.AssigneeID > 0 { baseCond += " AND assignee_id=" + com.ToStr(opts.AssigneeID) } - if opts.IsPull { - baseCond += " AND issue.is_pull=1" - } else { - baseCond += " AND issue.is_pull=0" - } + baseCond += " AND issue.is_pull=?" switch opts.FilterMode { case FM_ALL, FM_ASSIGN: - results, _ := x.Query(queryStr+baseCond, false) + results, _ := x.Query(queryStr+baseCond, false, opts.IsPull) stats.OpenCount = parseCountResult(results) - results, _ = x.Query(queryStr+baseCond, true) + results, _ = x.Query(queryStr+baseCond, true, opts.IsPull) stats.ClosedCount = parseCountResult(results) case FM_CREATE: baseCond += " AND poster_id=?" - results, _ := x.Query(queryStr+baseCond, false, opts.UserID) + results, _ := x.Query(queryStr+baseCond, false, opts.IsPull, opts.UserID) stats.OpenCount = parseCountResult(results) - results, _ = x.Query(queryStr+baseCond, true, opts.UserID) + results, _ = x.Query(queryStr+baseCond, true, opts.IsPull, opts.UserID) stats.ClosedCount = parseCountResult(results) case FM_MENTION: queryStr += " INNER JOIN `issue_user` ON `issue`.id=`issue_user`.issue_id" baseCond += " AND `issue_user`.uid=? AND `issue_user`.is_mentioned=?" - results, _ := x.Query(queryStr+baseCond, false, opts.UserID, true) + results, _ := x.Query(queryStr+baseCond, false, opts.IsPull, opts.UserID, true) stats.OpenCount = parseCountResult(results) - results, _ = x.Query(queryStr+baseCond, true, opts.UserID, true) + results, _ = x.Query(queryStr+baseCond, true, opts.IsPull, opts.UserID, true) stats.ClosedCount = parseCountResult(results) } return stats -- cgit v1.2.3