From 4fe292a0a44e8861b5199f783b24a742801a8d6b Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 14 May 2023 14:54:58 +0800 Subject: [PATCH 1/5] Support no label filter and batch clearing labels --- models/issues/issue.go | 34 ++++++++++++++++++++------------- options/locale/locale_en-US.ini | 1 + routers/web/repo/issue.go | 5 ++++- templates/repo/issue/list.tmpl | 4 ++++ 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/models/issues/issue.go b/models/issues/issue.go index 8c173433f254..f98f64a9b8c9 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -1313,12 +1313,16 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) { } if opts.LabelIDs != nil { - for i, labelID := range opts.LabelIDs { - 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) + if opts.LabelIDs[0] == 0 { + sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_label)") + } else { + for i, labelID := range opts.LabelIDs { + 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) + } } } } @@ -1705,17 +1709,21 @@ func getIssueStatsChunk(opts *IssueStatsOptions, issueIDs []int64) (*IssueStats, sess.In("issue.id", issueIDs) } - if len(opts.Labels) > 0 && opts.Labels != "0" { + if len(opts.Labels) > 0 { labelIDs, err := base.StringsToInt64s(strings.Split(opts.Labels, ",")) if err != nil { log.Warn("Malformed Labels argument: %s", opts.Labels) } else { - for i, labelID := range labelIDs { - 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) + if labelIDs[0] == 0 { + sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_label)") + } else { + for i, labelID := range labelIDs { + 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) + } } } } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 18b8bffe4a63..71fcb079183b 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1361,6 +1361,7 @@ issues.delete_branch_at = `deleted branch %s %s` issues.filter_label = Label issues.filter_label_exclude = `Use alt + click/enter to exclude labels` issues.filter_label_no_select = All labels +issues.filter_label_select_no_label = No Label issues.filter_milestone = Milestone issues.filter_milestone_all = All milestones issues.filter_milestone_none = No milestones diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index c2f30a01f473..66a498613975 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -170,8 +170,11 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti repo := ctx.Repo.Repository var labelIDs []int64 + // 1,-2 means including label 1 and excluding label 2 + // 0 means issues with no label + // blank means labels will not be filtered for issues selectLabels := ctx.FormString("labels") - if len(selectLabels) > 0 && selectLabels != "0" { + if len(selectLabels) > 0 { labelIDs, err = base.StringsToInt64s(strings.Split(selectLabels, ",")) if err != nil { ctx.ServerError("StringsToInt64s", err) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 68d40ffea70e..0f3b947cf278 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -38,6 +38,7 @@ {{.locale.Tr "repo.issues.filter_label_exclude" | Safe}} + {{.locale.Tr "repo.issues.filter_label_select_no_label"}} {{.locale.Tr "repo.issues.filter_label_no_select"}} {{$previousExclusiveScope := "_no_scope"}} {{range .Labels}} @@ -226,6 +227,9 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+
+ {{.locale.Tr "repo.issues.new.clear_labels"}} +
{{$previousExclusiveScope := "_no_scope"}} {{range .Labels}} {{$exclusiveScope := .ExclusiveScope}} From fd35ad6df2157236ad12f85b796acfe0f0437383 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 14 May 2023 20:09:32 +0800 Subject: [PATCH 2/5] Fix bug --- models/issues/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issues/issue.go b/models/issues/issue.go index f98f64a9b8c9..149b822cbef0 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -1312,7 +1312,7 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) { sess.And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()}) } - if opts.LabelIDs != nil { + if len(opts.LabelIDs) > 0 { if opts.LabelIDs[0] == 0 { sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_label)") } else { From b5959f542347aae728950a519cf90befcf1c52e6 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 14 May 2023 20:25:40 +0800 Subject: [PATCH 3/5] Add no assignee filter --- models/issues/issue.go | 4 ++++ options/locale/locale_en-US.ini | 1 + templates/repo/issue/list.tmpl | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/models/issues/issue.go b/models/issues/issue.go index 149b822cbef0..52e417b38e42 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -1251,6 +1251,8 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) { if opts.AssigneeID > 0 { applyAssigneeCondition(sess, opts.AssigneeID) + } else if opts.AssigneeID == db.NoConditionID { + sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_assignees)") } if opts.PosterID > 0 { @@ -1742,6 +1744,8 @@ func getIssueStatsChunk(opts *IssueStatsOptions, issueIDs []int64) (*IssueStats, if opts.AssigneeID > 0 { applyAssigneeCondition(sess, opts.AssigneeID) + } else if opts.AssigneeID == db.NoConditionID { + sess.Where("id NOT IN (SELECT issue_id FROM issue_assignees)") } if opts.PosterID > 0 { diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 71fcb079183b..b234420d95c8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1372,6 +1372,7 @@ issues.filter_project_all = All projects issues.filter_project_none = No project issues.filter_assignee = Assignee issues.filter_assginee_no_select = All assignees +issues.filter_assginee_no_assignee = No assignee issues.filter_poster = Author issues.filter_poster_no_select = All authors issues.filter_type = Type diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 0f3b947cf278..c257f04fd25b 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -157,6 +157,7 @@ {{svg "octicon-search" 16}}
+ {{.locale.Tr "repo.issues.filter_assginee_no_assignee"}} {{.locale.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} @@ -317,6 +318,9 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+
+ {{.locale.Tr "repo.issues.issues.new.clear_assignees"}} +
{{.locale.Tr "repo.issues.action_assignee_no_select"}}
From b2ae04597ecba7d9fa36f4652fee93a00f8580fd Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 14 May 2023 20:29:08 +0800 Subject: [PATCH 4/5] Fix translation --- templates/repo/issue/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index c257f04fd25b..7c2f73ca5929 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -319,7 +319,7 @@
- {{.locale.Tr "repo.issues.issues.new.clear_assignees"}} + {{.locale.Tr "repo.issues.new.clear_assignees"}}
{{.locale.Tr "repo.issues.action_assignee_no_select"}} From 87af026475e9164823482b5209f554c685829e64 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 16 May 2023 17:14:24 +0800 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: Jason Song --- models/issues/issue.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/issues/issue.go b/models/issues/issue.go index 52e417b38e42..df38e68519ed 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -1322,7 +1322,7 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) { 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 { + } else if labelID < 0 { // 0 is not supported here, so just ignore it sess.Where("issue.id not in (select issue_id from issue_label where label_id = ?)", -labelID) } } @@ -1723,7 +1723,7 @@ func getIssueStatsChunk(opts *IssueStatsOptions, issueIDs []int64) (*IssueStats, 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 { + } else if labelID < 0 { // 0 is not supported here, so just ignore it sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_label WHERE label_id = ?)", -labelID) } }