From b976a5df866ce1473a457a1fe33ae44769c092e8 Mon Sep 17 00:00:00 2001 From: jaqra Date: Sun, 3 Nov 2019 21:29:15 +0300 Subject: [PATCH 1/2] Fix (open/closed) issue count when label excluded --- models/issue.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/models/issue.go b/models/issue.go index b4bd190aa4cf4..df1981bd46ffe 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1323,8 +1323,12 @@ func GetIssueStats(opts *IssueStatsOptions) (*IssueStats, error) { log.Warn("Malformed Labels argument: %s", opts.Labels) } else { for i, labelID := range labelIDs { - sess.Join("INNER", fmt.Sprintf("issue_label il%d", i), - fmt.Sprintf("issue.id = il%[1]d.issue_id AND il%[1]d.label_id = %[2]d", i, labelID)) + if labelID > 0 { + sess.Join("INNER", fmt.Sprintf("issue_label il%d", i), + fmt.Sprintf("issue.id = il%[1]d.issue_id AND il%[1]d.label_id = %[2]d", i, labelID)) + } else { + sess.Where("issue.id not in (select issue_id from issue_label where label_id = ?)", -labelID) + } } } } From 5c89bced43bada3b315743b0e3b078e92055fef1 Mon Sep 17 00:00:00 2001 From: jaqra <48099350+jaqra@users.noreply.github.com> Date: Mon, 4 Nov 2019 10:10:26 +0300 Subject: [PATCH 2/2] Use capital sql keywords --- models/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issue.go b/models/issue.go index caddde0555e34..1e9d9731861fe 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1297,7 +1297,7 @@ func GetIssueStats(opts *IssueStatsOptions) (*IssueStats, error) { sess.Join("INNER", fmt.Sprintf("issue_label il%d", i), fmt.Sprintf("issue.id = il%[1]d.issue_id AND il%[1]d.label_id = %[2]d", i, labelID)) } else { - sess.Where("issue.id not in (select issue_id from issue_label where label_id = ?)", -labelID) + sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_label WHERE label_id = ?)", -labelID) } } }