diff options
| author | Emrah URHAN <raxetul@gmail.com> | 2015-11-22 19:40:18 +0200 |
|---|---|---|
| committer | Emrah URHAN <raxetul@gmail.com> | 2015-11-22 19:40:18 +0200 |
| commit | 737da1a3748d7c82af771d3ba4aa4c76ba219eee (patch) | |
| tree | b59104944ba28771752adcc1231a847b6704ac4d /models/issue.go | |
| parent | f63a468dfce812423b78a47cfa2583c5ad2faa49 (diff) | |
| parent | efaf60ba5a4a7c0954dbaf57203859db3258281f (diff) | |
Latest develop updates is merged with my RaspberryPi Dockerfile version.
Merge branch 'develop' of https://github.com/gogits/gogs into develop
Diffstat (limited to 'models/issue.go')
| -rw-r--r-- | models/issue.go | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/models/issue.go b/models/issue.go index 077e945c..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 @@ -1375,8 +1371,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 |