From 6267713f9f5d831e8a1c7bc07f6ede6f304c6fa7 Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Tue, 21 Jan 2025 14:32:49 +0100 Subject: [PATCH 01/10] Allow filtering issues by any assignee This is the opposite of the "No assignee" filter. It will match all issues that have at least one assignee. --- models/db/search.go | 5 +++++ models/issues/issue_search.go | 2 ++ options/locale/locale_en-US.ini | 1 + templates/repo/issue/filter_item_user_assign.tmpl | 4 ++++ templates/repo/issue/filter_list.tmpl | 1 + 5 files changed, 13 insertions(+) diff --git a/models/db/search.go b/models/db/search.go index e0a1b6bde9ffd..fa72959fa5680 100644 --- a/models/db/search.go +++ b/models/db/search.go @@ -30,6 +30,11 @@ const ( // eg: "milestone_id=-1" means "find the items without any milestone. const NoConditionID int64 = -1 +// AnyConditionID means a condition to filter the records which match any id. +// The inverse of the above NoConditionID +// eg: "assignee_id=-2" means "find the issues with an assignee" +const AnyConditionID int64 = -2 + // NonExistingID means a condition to match no result (eg: a non-existing user) // It doesn't use -1 or -2 because they are used as builtin users. const NonExistingID int64 = -1000000 diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go index f1cd125d495c4..566905b200180 100644 --- a/models/issues/issue_search.go +++ b/models/issues/issue_search.go @@ -359,6 +359,8 @@ func applyAssigneeCondition(sess *xorm.Session, assigneeID optional.Option[int64 } if assigneeID.Value() == db.NoConditionID { sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_assignees)") + } else if assigneeID.Value() == db.AnyConditionID { + sess.Where("issue.id IN (SELECT issue_id FROM issue_assignees)") } else { sess.Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id"). And("issue_assignees.assignee_id = ?", assigneeID.Value()) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 533eb136f94ff..4401660b8acd6 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1531,6 +1531,7 @@ 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_assignee_any_assignee = Any assignee issues.filter_poster = Author issues.filter_user_placeholder = Search users issues.filter_user_no_select = All users diff --git a/templates/repo/issue/filter_item_user_assign.tmpl b/templates/repo/issue/filter_item_user_assign.tmpl index 4f1db71d57f0a..dd5d96319a403 100644 --- a/templates/repo/issue/filter_item_user_assign.tmpl +++ b/templates/repo/issue/filter_item_user_assign.tmpl @@ -6,6 +6,7 @@ * TextFilterTitle * TextZeroValue: the text for "all issues" * TextNegativeOne: the text for "issues with no assignee" +* TextNegativeTwo: the text for "issues with any assignee" */}} {{$queryLink := .QueryLink}}
@@ -21,6 +22,9 @@ {{if $.TextNegativeOne}} {{$.TextNegativeOne}} {{end}} + {{if $.TextNegativeTwo}} + {{$.TextNegativeTwo}} + {{end}}
{{range .UserSearchList}} diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index 7612d93b2128f..56eec7469bef5 100644 --- a/templates/repo/issue/filter_list.tmpl +++ b/templates/repo/issue/filter_list.tmpl @@ -96,6 +96,7 @@ "TextFilterTitle" (ctx.Locale.Tr "repo.issues.filter_assignee") "TextZeroValue" (ctx.Locale.Tr "repo.issues.filter_assginee_no_select") "TextNegativeOne" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee") + "TextNegativeTwo" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee") }} {{if .IsSigned}} From 6929edabb90ab9111e5ec432d7d5df36516f6972 Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Sun, 23 Feb 2025 20:28:02 +0100 Subject: [PATCH 02/10] Change magic number since -2 has some internal meaning --- models/db/search.go | 4 ++-- templates/repo/issue/filter_item_user_assign.tmpl | 6 +++--- templates/repo/issue/filter_list.tmpl | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/models/db/search.go b/models/db/search.go index fa72959fa5680..6e82be6709154 100644 --- a/models/db/search.go +++ b/models/db/search.go @@ -32,8 +32,8 @@ const NoConditionID int64 = -1 // AnyConditionID means a condition to filter the records which match any id. // The inverse of the above NoConditionID -// eg: "assignee_id=-2" means "find the issues with an assignee" -const AnyConditionID int64 = -2 +// eg: "assignee_id=-1000001" means "find the issues with an assignee" +const AnyConditionID int64 = -1000001 // NonExistingID means a condition to match no result (eg: a non-existing user) // It doesn't use -1 or -2 because they are used as builtin users. diff --git a/templates/repo/issue/filter_item_user_assign.tmpl b/templates/repo/issue/filter_item_user_assign.tmpl index dd5d96319a403..028a0bfca5a93 100644 --- a/templates/repo/issue/filter_item_user_assign.tmpl +++ b/templates/repo/issue/filter_item_user_assign.tmpl @@ -6,7 +6,7 @@ * TextFilterTitle * TextZeroValue: the text for "all issues" * TextNegativeOne: the text for "issues with no assignee" -* TextNegativeTwo: the text for "issues with any assignee" +* TextAnyCondition: the text for "issues with any assignee" */}} {{$queryLink := .QueryLink}}
@@ -22,8 +22,8 @@ {{if $.TextNegativeOne}} {{$.TextNegativeOne}} {{end}} - {{if $.TextNegativeTwo}} - {{$.TextNegativeTwo}} + {{if $.TextAnyCondition}} + {{$.TextAnyCondition}} {{end}}
{{range .UserSearchList}} diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index 56eec7469bef5..ce45b5d9b6ec4 100644 --- a/templates/repo/issue/filter_list.tmpl +++ b/templates/repo/issue/filter_list.tmpl @@ -96,7 +96,7 @@ "TextFilterTitle" (ctx.Locale.Tr "repo.issues.filter_assignee") "TextZeroValue" (ctx.Locale.Tr "repo.issues.filter_assginee_no_select") "TextNegativeOne" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee") - "TextNegativeTwo" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee") + "TextAnyCondition" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee") }} {{if .IsSigned}} From 9a741dfdfaef03229a3c9dc0bb3a06ae0aec7bb9 Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Sun, 23 Feb 2025 20:33:40 +0100 Subject: [PATCH 03/10] Add indexer support for searching issues with any assignee --- modules/indexer/issues/internal/model.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/indexer/issues/internal/model.go b/modules/indexer/issues/internal/model.go index 09dcbf4804c88..1c9e3531cd917 100644 --- a/modules/indexer/issues/internal/model.go +++ b/modules/indexer/issues/internal/model.go @@ -98,7 +98,8 @@ type SearchOptions struct { PosterID optional.Option[int64] // poster of the issues - AssigneeID optional.Option[int64] // assignee of the issues, zero means no assignee + AssigneeID optional.Option[int64] // assignee of the issues, zero means no assignee + AnyAssigneeOnly bool // if the issues have any assignee (non-zero), if true, AssigneeID will be ignored MentionID optional.Option[int64] // mentioned user of the issues From a08f6b0c9e64ae6a4c82a44436a432bdb16d2a81 Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Sun, 23 Feb 2025 20:34:22 +0100 Subject: [PATCH 04/10] DB indexer support for searching issues with any assignee --- modules/indexer/issues/db/options.go | 7 ++++++- modules/indexer/issues/indexer_test.go | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/modules/indexer/issues/db/options.go b/modules/indexer/issues/db/options.go index 87ce398a202d0..ac9f034ed5ce2 100644 --- a/modules/indexer/issues/db/options.go +++ b/modules/indexer/issues/db/options.go @@ -49,12 +49,17 @@ func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_m return value } + assigneeID := optional.Some(convertID(options.AssigneeID)) + if options.AnyAssigneeOnly { + assigneeID = optional.Some(db.AnyConditionID) + } + opts := &issue_model.IssuesOptions{ Paginator: options.Paginator, RepoIDs: options.RepoIDs, AllPublic: options.AllPublic, RepoCond: nil, - AssigneeID: optional.Some(convertID(options.AssigneeID)), + AssigneeID: assigneeID, PosterID: options.PosterID, MentionedID: convertID(options.MentionID), ReviewRequestedID: convertID(options.ReviewRequestedID), diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index 7def2a2c6e5b9..e1dbd793b5a57 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -44,6 +44,7 @@ func TestDBSearchIssues(t *testing.T) { t.Run("search issues with order", searchIssueWithOrder) t.Run("search issues in project", searchIssueInProject) t.Run("search issues with paginator", searchIssueWithPaginator) + t.Run("search issues with any assignee", searchIssueWithAnyAssignee) } func searchIssueWithKeyword(t *testing.T) { @@ -460,3 +461,25 @@ func searchIssueWithPaginator(t *testing.T) { assert.Equal(t, test.expectedTotal, total) } } + +func searchIssueWithAnyAssignee(t *testing.T) { + tests := []struct { + opts SearchOptions + expectedIDs []int64 + expectedTotal int64 + }{ + { + SearchOptions{ + AnyAssigneeOnly: true, + }, + []int64{17, 6, 1}, + 3, + }, + } + for _, test := range tests { + issueIDs, total, err := SearchIssues(t.Context(), &test.opts) + require.NoError(t, err) + assert.Equal(t, test.expectedIDs, issueIDs) + assert.Equal(t, test.expectedTotal, total) + } +} From f350f1d8523ca025ddc328359ac6b0dcb97dc6c5 Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Sun, 23 Feb 2025 21:04:17 +0100 Subject: [PATCH 05/10] Bleve indexer support for searching issues with any assignee --- modules/indexer/issues/bleve/bleve.go | 5 ++++- modules/indexer/issues/internal/tests/tests.go | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go index bf51bd6c14857..8d2c4f34952e6 100644 --- a/modules/indexer/issues/bleve/bleve.go +++ b/modules/indexer/issues/bleve/bleve.go @@ -9,6 +9,7 @@ import ( indexer_internal "code.gitea.io/gitea/modules/indexer/internal" inner_bleve "code.gitea.io/gitea/modules/indexer/internal/bleve" "code.gitea.io/gitea/modules/indexer/issues/internal" + "code.gitea.io/gitea/modules/optional" "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" @@ -236,7 +237,9 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) ( queries = append(queries, inner_bleve.NumericEqualityQuery(options.PosterID.Value(), "poster_id")) } - if options.AssigneeID.Has() { + if options.AnyAssigneeOnly { + queries = append(queries, inner_bleve.NumericRangeInclusiveQuery(optional.Some[int64](1), optional.None[int64](), "assignee_id")) + } else if options.AssigneeID.Has() { queries = append(queries, inner_bleve.NumericEqualityQuery(options.AssigneeID.Value(), "assignee_id")) } diff --git a/modules/indexer/issues/internal/tests/tests.go b/modules/indexer/issues/internal/tests/tests.go index 0483853dfd19e..af23ec4e46fef 100644 --- a/modules/indexer/issues/internal/tests/tests.go +++ b/modules/indexer/issues/internal/tests/tests.go @@ -647,6 +647,21 @@ var cases = []*testIndexerCase{ } }, }, + { + Name: "SearchAnyAssignee", + SearchOptions: &internal.SearchOptions{ + AnyAssigneeOnly: true, + }, + Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) { + assert.Len(t, result.Hits, 180) + for _, v := range result.Hits { + assert.GreaterOrEqual(t, data[v.ID].AssigneeID, int64(1)) + } + assert.Equal(t, countIndexerData(data, func(v *internal.IndexerData) bool { + return v.AssigneeID >= 1 + }), result.Total) + }, + }, } type testIndexerCase struct { From f7faab1ac4297b55288b7db2dc1bd3747ccec587 Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Sun, 23 Feb 2025 21:48:22 +0100 Subject: [PATCH 06/10] Elasticsearch indexer support for searching issues with any assignee --- modules/indexer/issues/elasticsearch/elasticsearch.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go index 4c293f3f2a9c8..69f5e18c5f7ce 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch.go @@ -209,7 +209,11 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) ( query.Must(elastic.NewTermQuery("poster_id", options.PosterID.Value())) } - if options.AssigneeID.Has() { + if options.AnyAssigneeOnly { + q := elastic.NewRangeQuery("assignee_id") + q.Gte(1) + query.Must(q) + } else if options.AssigneeID.Has() { query.Must(elastic.NewTermQuery("assignee_id", options.AssigneeID.Value())) } From 8f6f6306f877bb5ca4034376bb1dfe2eea2900fe Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Sun, 23 Feb 2025 21:50:55 +0100 Subject: [PATCH 07/10] Meilisearch indexer support for searching issues with any assignee --- modules/indexer/issues/meilisearch/meilisearch.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/indexer/issues/meilisearch/meilisearch.go b/modules/indexer/issues/meilisearch/meilisearch.go index 1066e96272575..b0c88933cbaf5 100644 --- a/modules/indexer/issues/meilisearch/meilisearch.go +++ b/modules/indexer/issues/meilisearch/meilisearch.go @@ -186,7 +186,9 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) ( query.And(inner_meilisearch.NewFilterEq("poster_id", options.PosterID.Value())) } - if options.AssigneeID.Has() { + if options.AnyAssigneeOnly { + query.And(inner_meilisearch.NewFilterGte("assignee_id", 1)) + } else if options.AssigneeID.Has() { query.And(inner_meilisearch.NewFilterEq("assignee_id", options.AssigneeID.Value())) } From 520d29ce347f7aa44385e136ab89589b7ff5bb6e Mon Sep 17 00:00:00 2001 From: Andreas Svanberg Date: Mon, 24 Feb 2025 08:26:25 +0100 Subject: [PATCH 08/10] Populate indexer search options correctly when filtering for any assignee --- modules/indexer/issues/dboptions.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go index 4f6ad96d222d7..701e18af67329 100644 --- a/modules/indexer/issues/dboptions.go +++ b/modules/indexer/issues/dboptions.go @@ -47,6 +47,8 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp if opts.AssigneeID.Value() == db.NoConditionID { searchOpt.AssigneeID = optional.Some[int64](0) // FIXME: this is inconsistent from other places, 0 means "no assignee" + } else if opts.AssigneeID.Value() == db.AnyConditionID { + searchOpt.AnyAssigneeOnly = true } else if opts.AssigneeID.Value() != 0 { searchOpt.AssigneeID = opts.AssigneeID } From 330c7e257b6fb76582849b0795f6e8c0daad58b4 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 20 Mar 2025 16:42:25 +0800 Subject: [PATCH 09/10] fix --- models/db/search.go | 9 ------ models/issues/issue_search.go | 29 ++++++++----------- modules/indexer/issues/bleve/bleve.go | 19 ++++++++---- modules/indexer/issues/db/options.go | 7 +---- modules/indexer/issues/dboptions.go | 8 +---- .../issues/elasticsearch/elasticsearch.go | 22 +++++++++----- modules/indexer/issues/internal/model.go | 6 ++-- .../indexer/issues/meilisearch/meilisearch.go | 22 +++++++++----- options/locale/locale_en-US.ini | 5 ++-- routers/api/v1/repo/issue.go | 8 ++--- routers/web/org/projects.go | 4 +-- routers/web/repo/issue_list.go | 18 ++++++------ routers/web/repo/projects.go | 4 +-- routers/web/shared/user/helper.go | 18 +++++------- routers/web/user/home.go | 16 +++++----- templates/projects/view.tmpl | 4 +-- .../repo/issue/filter_item_user_assign.tmpl | 25 +++++++++------- templates/repo/issue/filter_list.tmpl | 5 ++-- web_src/fomantic/build/components/dropdown.js | 6 +++- 19 files changed, 116 insertions(+), 119 deletions(-) diff --git a/models/db/search.go b/models/db/search.go index 6e82be6709154..44d54f21fcb77 100644 --- a/models/db/search.go +++ b/models/db/search.go @@ -29,12 +29,3 @@ const ( // NoConditionID means a condition to filter the records which don't match any id. // eg: "milestone_id=-1" means "find the items without any milestone. const NoConditionID int64 = -1 - -// AnyConditionID means a condition to filter the records which match any id. -// The inverse of the above NoConditionID -// eg: "assignee_id=-1000001" means "find the issues with an assignee" -const AnyConditionID int64 = -1000001 - -// NonExistingID means a condition to match no result (eg: a non-existing user) -// It doesn't use -1 or -2 because they are used as builtin users. -const NonExistingID int64 = -1000000 diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go index d788527f89837..621091d9a10f1 100644 --- a/models/issues/issue_search.go +++ b/models/issues/issue_search.go @@ -27,8 +27,8 @@ type IssuesOptions struct { //nolint RepoIDs []int64 // overwrites RepoCond if the length is not 0 AllPublic bool // include also all public repositories RepoCond builder.Cond - AssigneeID optional.Option[int64] - PosterID optional.Option[int64] + AssigneeID string // "(none)" or "(any)" or a user ID + PosterID string // "(none)" or "(any)" or a user ID MentionedID int64 ReviewRequestedID int64 ReviewedID int64 @@ -356,28 +356,23 @@ func issuePullAccessibleRepoCond(repoIDstr string, userID int64, owner *user_mod return cond } -func applyAssigneeCondition(sess *xorm.Session, assigneeID optional.Option[int64]) { +func applyAssigneeCondition(sess *xorm.Session, assigneeID string) { // old logic: 0 is also treated as "not filtering assignee", because the "assignee" was read as FormInt64 - if !assigneeID.Has() || assigneeID.Value() == 0 { - return - } - if assigneeID.Value() == db.NoConditionID { + if assigneeID == "(none)" { sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_assignees)") - } else if assigneeID.Value() == db.AnyConditionID { + } else if assigneeID == "(any)" { sess.Where("issue.id IN (SELECT issue_id FROM issue_assignees)") - } else { + } else if assigneeIDInt64, _ := strconv.ParseInt(assigneeID, 10, 64); assigneeIDInt64 > 0 { sess.Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id"). - And("issue_assignees.assignee_id = ?", assigneeID.Value()) + And("issue_assignees.assignee_id = ?", assigneeIDInt64) } } -func applyPosterCondition(sess *xorm.Session, posterID optional.Option[int64]) { - if !posterID.Has() { - return - } - // poster doesn't need to support db.NoConditionID(-1), so just use the value as-is - if posterID.Has() { - sess.And("issue.poster_id=?", posterID.Value()) +func applyPosterCondition(sess *xorm.Session, posterID string) { + if posterID == "(none)" { + sess.And("issue.poster_id=0") + } else if posterIDInt64, _ := strconv.ParseInt(posterID, 10, 64); posterIDInt64 > 0 { + sess.And("issue.poster_id=?", posterIDInt64) } } diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go index b30a60f5496e0..39d96cab9853c 100644 --- a/modules/indexer/issues/bleve/bleve.go +++ b/modules/indexer/issues/bleve/bleve.go @@ -5,6 +5,7 @@ package bleve import ( "context" + "strconv" "code.gitea.io/gitea/modules/indexer" indexer_internal "code.gitea.io/gitea/modules/indexer/internal" @@ -247,14 +248,20 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) ( queries = append(queries, inner_bleve.NumericEqualityQuery(options.ProjectColumnID.Value(), "project_board_id")) } - if options.PosterID.Has() { - queries = append(queries, inner_bleve.NumericEqualityQuery(options.PosterID.Value(), "poster_id")) + if options.PosterID != "" { + // "(none)" becomes 0, it means no poster + posterIDInt64, _ := strconv.ParseInt(options.PosterID, 10, 64) + queries = append(queries, inner_bleve.NumericEqualityQuery(posterIDInt64, "poster_id")) } - if options.AnyAssigneeOnly { - queries = append(queries, inner_bleve.NumericRangeInclusiveQuery(optional.Some[int64](1), optional.None[int64](), "assignee_id")) - } else if options.AssigneeID.Has() { - queries = append(queries, inner_bleve.NumericEqualityQuery(options.AssigneeID.Value(), "assignee_id")) + if options.AssigneeID != "" { + if options.AssigneeID == "(any)" { + queries = append(queries, inner_bleve.NumericRangeInclusiveQuery(optional.Some[int64](1), optional.None[int64](), "assignee_id")) + } else { + // "(none)" becomes 0, it means no assignee + assigneeIDInt64, _ := strconv.ParseInt(options.AssigneeID, 10, 64) + queries = append(queries, inner_bleve.NumericEqualityQuery(assigneeIDInt64, "assignee_id")) + } } if options.MentionID.Has() { diff --git a/modules/indexer/issues/db/options.go b/modules/indexer/issues/db/options.go index ac9f034ed5ce2..3b19d742ba251 100644 --- a/modules/indexer/issues/db/options.go +++ b/modules/indexer/issues/db/options.go @@ -49,17 +49,12 @@ func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_m return value } - assigneeID := optional.Some(convertID(options.AssigneeID)) - if options.AnyAssigneeOnly { - assigneeID = optional.Some(db.AnyConditionID) - } - opts := &issue_model.IssuesOptions{ Paginator: options.Paginator, RepoIDs: options.RepoIDs, AllPublic: options.AllPublic, RepoCond: nil, - AssigneeID: assigneeID, + AssigneeID: options.AssigneeID, PosterID: options.PosterID, MentionedID: convertID(options.MentionID), ReviewRequestedID: convertID(options.ReviewRequestedID), diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go index 701e18af67329..4e2dff572a918 100644 --- a/modules/indexer/issues/dboptions.go +++ b/modules/indexer/issues/dboptions.go @@ -45,13 +45,7 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp searchOpt.ProjectID = optional.Some[int64](0) // Those issues with no project(projectid==0) } - if opts.AssigneeID.Value() == db.NoConditionID { - searchOpt.AssigneeID = optional.Some[int64](0) // FIXME: this is inconsistent from other places, 0 means "no assignee" - } else if opts.AssigneeID.Value() == db.AnyConditionID { - searchOpt.AnyAssigneeOnly = true - } else if opts.AssigneeID.Value() != 0 { - searchOpt.AssigneeID = opts.AssigneeID - } + searchOpt.AssigneeID = opts.AssigneeID // See the comment of issues_model.SearchOptions for the reason why we need to convert convertID := func(id int64) optional.Option[int64] { diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go index 54d8d7761edbb..e3b1b1705909a 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch.go @@ -212,16 +212,22 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) ( query.Must(elastic.NewTermQuery("project_board_id", options.ProjectColumnID.Value())) } - if options.PosterID.Has() { - query.Must(elastic.NewTermQuery("poster_id", options.PosterID.Value())) + if options.PosterID != "" { + // "(none)" becomes 0, it means no poster + posterIDInt64, _ := strconv.ParseInt(options.PosterID, 10, 64) + query.Must(elastic.NewTermQuery("poster_id", posterIDInt64)) } - if options.AnyAssigneeOnly { - q := elastic.NewRangeQuery("assignee_id") - q.Gte(1) - query.Must(q) - } else if options.AssigneeID.Has() { - query.Must(elastic.NewTermQuery("assignee_id", options.AssigneeID.Value())) + if options.AssigneeID != "" { + if options.AssigneeID == "(any)" { + q := elastic.NewRangeQuery("assignee_id") + q.Gte(1) + query.Must(q) + } else { + // "(none)" becomes 0, it means no assignee + assigneeIDInt64, _ := strconv.ParseInt(options.AssigneeID, 10, 64) + query.Must(elastic.NewTermQuery("assignee_id", assigneeIDInt64)) + } } if options.MentionID.Has() { diff --git a/modules/indexer/issues/internal/model.go b/modules/indexer/issues/internal/model.go index 62630f76b6e9d..0d4f0f727d53c 100644 --- a/modules/indexer/issues/internal/model.go +++ b/modules/indexer/issues/internal/model.go @@ -97,10 +97,8 @@ type SearchOptions struct { ProjectID optional.Option[int64] // project the issues belong to ProjectColumnID optional.Option[int64] // project column the issues belong to - PosterID optional.Option[int64] // poster of the issues - - AssigneeID optional.Option[int64] // assignee of the issues, zero means no assignee - AnyAssigneeOnly bool // if the issues have any assignee (non-zero), if true, AssigneeID will be ignored + PosterID string // poster of the issues, "(none)" or "(any)" or a user ID + AssigneeID string // assignee of the issues, "(none)" or "(any)" or a user ID MentionID optional.Option[int64] // mentioned user of the issues diff --git a/modules/indexer/issues/meilisearch/meilisearch.go b/modules/indexer/issues/meilisearch/meilisearch.go index f2a371313d9ed..759a98473f780 100644 --- a/modules/indexer/issues/meilisearch/meilisearch.go +++ b/modules/indexer/issues/meilisearch/meilisearch.go @@ -187,14 +187,20 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) ( query.And(inner_meilisearch.NewFilterEq("project_board_id", options.ProjectColumnID.Value())) } - if options.PosterID.Has() { - query.And(inner_meilisearch.NewFilterEq("poster_id", options.PosterID.Value())) - } - - if options.AnyAssigneeOnly { - query.And(inner_meilisearch.NewFilterGte("assignee_id", 1)) - } else if options.AssigneeID.Has() { - query.And(inner_meilisearch.NewFilterEq("assignee_id", options.AssigneeID.Value())) + if options.PosterID != "" { + // "(none)" becomes 0, it means no poster + posterIDInt64, _ := strconv.ParseInt(options.PosterID, 10, 64) + query.And(inner_meilisearch.NewFilterEq("poster_id", posterIDInt64)) + } + + if options.AssigneeID != "" { + if options.AssigneeID == "(any)" { + query.And(inner_meilisearch.NewFilterGte("assignee_id", 1)) + } else { + // "(none)" becomes 0, it means no assignee + assigneeIDInt64, _ := strconv.ParseInt(options.AssigneeID, 10, 64) + query.And(inner_meilisearch.NewFilterEq("assignee_id", assigneeIDInt64)) + } } if options.MentionID.Has() { diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d08ddacb55b8d..573c00eee6b55 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1547,9 +1547,8 @@ issues.filter_project = Project 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_assignee_any_assignee = Any assignee +issues.filter_assginee_no_assignee = Assigned to nobody +issues.filter_assignee_any_assignee = Assigned to anybody issues.filter_poster = Author issues.filter_user_placeholder = Search users issues.filter_user_no_select = All users diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index c9575ff98a001..c0d638b0542a8 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -290,10 +290,10 @@ func SearchIssues(ctx *context.APIContext) { if ctx.IsSigned { ctxUserID := ctx.Doer.ID if ctx.FormBool("created") { - searchOpt.PosterID = optional.Some(ctxUserID) + searchOpt.PosterID = strconv.FormatInt(ctxUserID, 10) } if ctx.FormBool("assigned") { - searchOpt.AssigneeID = optional.Some(ctxUserID) + searchOpt.AssigneeID = strconv.FormatInt(ctxUserID, 10) } if ctx.FormBool("mentioned") { searchOpt.MentionID = optional.Some(ctxUserID) @@ -538,10 +538,10 @@ func ListIssues(ctx *context.APIContext) { } if createdByID > 0 { - searchOpt.PosterID = optional.Some(createdByID) + searchOpt.PosterID = strconv.FormatInt(createdByID, 10) } if assignedByID > 0 { - searchOpt.AssigneeID = optional.Some(assignedByID) + searchOpt.AssigneeID = strconv.FormatInt(assignedByID, 64) } if mentionedByID > 0 { searchOpt.MentionID = optional.Some(mentionedByID) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 985fd2ca45d4d..49f479277269e 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -347,11 +347,11 @@ func ViewProject(ctx *context.Context) { if ctx.Written() { return } - assigneeID := ctx.FormInt64("assignee") // TODO: use "optional" but not 0 in the future + assigneeID := ctx.FormString("assignee") opts := issues_model.IssuesOptions{ LabelIDs: labelIDs, - AssigneeID: optional.Some(assigneeID), + AssigneeID: assigneeID, Owner: project.Owner, Doer: ctx.Doer, } diff --git a/routers/web/repo/issue_list.go b/routers/web/repo/issue_list.go index a65ae77795584..69b38c81ecbc8 100644 --- a/routers/web/repo/issue_list.go +++ b/routers/web/repo/issue_list.go @@ -208,10 +208,10 @@ func SearchIssues(ctx *context.Context) { if ctx.IsSigned { ctxUserID := ctx.Doer.ID if ctx.FormBool("created") { - searchOpt.PosterID = optional.Some(ctxUserID) + searchOpt.PosterID = strconv.FormatInt(ctxUserID, 10) } if ctx.FormBool("assigned") { - searchOpt.AssigneeID = optional.Some(ctxUserID) + searchOpt.AssigneeID = strconv.FormatInt(ctxUserID, 10) } if ctx.FormBool("mentioned") { searchOpt.MentionID = optional.Some(ctxUserID) @@ -373,10 +373,10 @@ func SearchRepoIssuesJSON(ctx *context.Context) { } if createdByID > 0 { - searchOpt.PosterID = optional.Some(createdByID) + searchOpt.PosterID = strconv.FormatInt(createdByID, 10) } if assignedByID > 0 { - searchOpt.AssigneeID = optional.Some(assignedByID) + searchOpt.AssigneeID = strconv.FormatInt(assignedByID, 10) } if mentionedByID > 0 { searchOpt.MentionID = optional.Some(mentionedByID) @@ -490,7 +490,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt viewType = "all" } - assigneeID := ctx.FormInt64("assignee") // TODO: use "optional" but not 0 in the future + assigneeID := ctx.FormString("assignee") posterUsername := ctx.FormString("poster") posterUserID := shared_user.GetFilterUserIDByName(ctx, posterUsername) var mentionedID, reviewRequestedID, reviewedID int64 @@ -498,11 +498,11 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt if ctx.IsSigned { switch viewType { case "created_by": - posterUserID = optional.Some(ctx.Doer.ID) + posterUserID = strconv.FormatInt(ctx.Doer.ID, 10) case "mentioned": mentionedID = ctx.Doer.ID case "assigned": - assigneeID = ctx.Doer.ID + assigneeID = fmt.Sprint(ctx.Doer.ID) case "review_requested": reviewRequestedID = ctx.Doer.ID case "reviewed_by": @@ -532,7 +532,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt LabelIDs: labelIDs, MilestoneIDs: mileIDs, ProjectID: projectID, - AssigneeID: optional.Some(assigneeID), + AssigneeID: assigneeID, MentionedID: mentionedID, PosterID: posterUserID, ReviewRequestedID: reviewRequestedID, @@ -613,7 +613,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt PageSize: setting.UI.IssuePagingNum, }, RepoIDs: []int64{repo.ID}, - AssigneeID: optional.Some(assigneeID), + AssigneeID: assigneeID, PosterID: posterUserID, MentionedID: mentionedID, ReviewRequestedID: reviewRequestedID, diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 5b81a5e4d1b6e..6810025c6f01b 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -315,12 +315,12 @@ func ViewProject(ctx *context.Context) { labelIDs := issue.PrepareFilterIssueLabels(ctx, ctx.Repo.Repository.ID, ctx.Repo.Owner) - assigneeID := ctx.FormInt64("assignee") // TODO: use "optional" but not 0 in the future + assigneeID := ctx.FormString("assignee") issuesMap, err := project_service.LoadIssuesFromProject(ctx, project, &issues_model.IssuesOptions{ RepoIDs: []int64{ctx.Repo.Repository.ID}, LabelIDs: labelIDs, - AssigneeID: optional.Some(assigneeID), + AssigneeID: assigneeID, }) if err != nil { ctx.ServerError("LoadIssuesOfColumns", err) diff --git a/routers/web/shared/user/helper.go b/routers/web/shared/user/helper.go index b82181a1df169..dddfc36218258 100644 --- a/routers/web/shared/user/helper.go +++ b/routers/web/shared/user/helper.go @@ -8,9 +8,7 @@ import ( "slices" "strconv" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" ) func MakeSelfOnTop(doer *user.User, users []*user.User) []*user.User { @@ -34,19 +32,19 @@ func MakeSelfOnTop(doer *user.User, users []*user.User) []*user.User { // So it's better to make it work like GitHub: users could input username directly. // Since it only converts the username to ID directly and is only used internally (to search issues), so no permission check is needed. // Return values: -// * nil: no filter -// * some(id): match the id, the id could be -1 to match the issues without assignee -// * some(NonExistingID): match no issue (due to the user doesn't exist) -func GetFilterUserIDByName(ctx context.Context, name string) optional.Option[int64] { +// * "": no filter +// * "{the-id}": match the id +// * "(none)": match no issue (due to the user doesn't exist) +func GetFilterUserIDByName(ctx context.Context, name string) string { if name == "" { - return optional.None[int64]() + return "" } u, err := user.GetUserByName(ctx, name) if err != nil { if id, err := strconv.ParseInt(name, 10, 64); err == nil { - return optional.Some(id) + return strconv.FormatInt(id, 10) } - return optional.Some(db.NonExistingID) + return "(none)" } - return optional.Some(u.ID) + return strconv.FormatInt(u.ID, 10) } diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 8e030a62a2f23..1166d5f277f9f 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -501,9 +501,9 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { case issues_model.FilterModeAll: case issues_model.FilterModeYourRepositories: case issues_model.FilterModeAssign: - opts.AssigneeID = optional.Some(ctx.Doer.ID) + opts.AssigneeID = strconv.FormatInt(ctx.Doer.ID, 10) case issues_model.FilterModeCreate: - opts.PosterID = optional.Some(ctx.Doer.ID) + opts.PosterID = strconv.FormatInt(ctx.Doer.ID, 10) case issues_model.FilterModeMention: opts.MentionedID = ctx.Doer.ID case issues_model.FilterModeReviewRequested: @@ -792,9 +792,9 @@ func getUserIssueStats(ctx *context.Context, ctxUser *user_model.User, filterMod case issues_model.FilterModeYourRepositories: openClosedOpts.AllPublic = false case issues_model.FilterModeAssign: - openClosedOpts.AssigneeID = optional.Some(doerID) + openClosedOpts.AssigneeID = strconv.FormatInt(doerID, 10) case issues_model.FilterModeCreate: - openClosedOpts.PosterID = optional.Some(doerID) + openClosedOpts.PosterID = strconv.FormatInt(doerID, 10) case issues_model.FilterModeMention: openClosedOpts.MentionID = optional.Some(doerID) case issues_model.FilterModeReviewRequested: @@ -816,8 +816,8 @@ func getUserIssueStats(ctx *context.Context, ctxUser *user_model.User, filterMod // Below stats are for the left sidebar opts = opts.Copy(func(o *issue_indexer.SearchOptions) { - o.AssigneeID = nil - o.PosterID = nil + o.AssigneeID = "" + o.PosterID = "" o.MentionID = nil o.ReviewRequestedID = nil o.ReviewedID = nil @@ -827,11 +827,11 @@ func getUserIssueStats(ctx *context.Context, ctxUser *user_model.User, filterMod if err != nil { return nil, err } - ret.AssignCount, err = issue_indexer.CountIssues(ctx, opts.Copy(func(o *issue_indexer.SearchOptions) { o.AssigneeID = optional.Some(doerID) })) + ret.AssignCount, err = issue_indexer.CountIssues(ctx, opts.Copy(func(o *issue_indexer.SearchOptions) { o.AssigneeID = strconv.FormatInt(doerID, 10) })) if err != nil { return nil, err } - ret.CreateCount, err = issue_indexer.CountIssues(ctx, opts.Copy(func(o *issue_indexer.SearchOptions) { o.PosterID = optional.Some(doerID) })) + ret.CreateCount, err = issue_indexer.CountIssues(ctx, opts.Copy(func(o *issue_indexer.SearchOptions) { o.PosterID = strconv.FormatInt(doerID, 10) })) if err != nil { return nil, err } diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 3cbd651059c65..f4478d544a70a 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -15,8 +15,8 @@ "UserSearchList" $.Assignees "SelectedUserId" $.AssigneeID "TextFilterTitle" (ctx.Locale.Tr "repo.issues.filter_assignee") - "TextZeroValue" (ctx.Locale.Tr "repo.issues.filter_assginee_no_select") - "TextNegativeOne" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee") + "TextFilterMatchNone" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee") + "TextFilterMatchAny" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee") }}
diff --git a/templates/repo/issue/filter_item_user_assign.tmpl b/templates/repo/issue/filter_item_user_assign.tmpl index 028a0bfca5a93..c7db7bc9d8fd7 100644 --- a/templates/repo/issue/filter_item_user_assign.tmpl +++ b/templates/repo/issue/filter_item_user_assign.tmpl @@ -16,19 +16,24 @@ {{svg "octicon-search" 16}} - {{if $.TextZeroValue}} - {{$.TextZeroValue}} - {{end}} - {{if $.TextNegativeOne}} - {{$.TextNegativeOne}} + {{if $.TextFilterMatchNone}} + {{$isSelected := eq .SelectedUserId "(none)"}} + + {{svg "octicon-check" 14 (Iif $isSelected "" "tw-invisible")}} {{$.TextFilterMatchNone}} + {{end}} - {{if $.TextAnyCondition}} - {{$.TextAnyCondition}} + {{if $.TextFilterMatchAny}} + {{$isSelected := eq .SelectedUserId "(any)"}} + + {{svg "octicon-check" 14 (Iif $isSelected "" "tw-invisible")}} {{$.TextFilterMatchAny}} + {{end}}
- {{range .UserSearchList}} - - {{ctx.AvatarUtils.Avatar . 20}}{{template "repo/search_name" .}} + {{range $user := .UserSearchList}} + {{$isSelected := eq $.SelectedUserId (print $user.ID)}} + + {{svg "octicon-check" 14 (Iif $isSelected "" "tw-invisible")}} + {{ctx.AvatarUtils.Avatar $user 20}}{{template "repo/search_name" .}} {{end}} diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index ce45b5d9b6ec4..58ca4a7c00d64 100644 --- a/templates/repo/issue/filter_list.tmpl +++ b/templates/repo/issue/filter_list.tmpl @@ -94,9 +94,8 @@ "UserSearchList" $.Assignees "SelectedUserId" $.AssigneeID "TextFilterTitle" (ctx.Locale.Tr "repo.issues.filter_assignee") - "TextZeroValue" (ctx.Locale.Tr "repo.issues.filter_assginee_no_select") - "TextNegativeOne" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee") - "TextAnyCondition" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee") + "TextFilterMatchNone" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee") + "TextFilterMatchAny" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee") }} {{if .IsSigned}} diff --git a/web_src/fomantic/build/components/dropdown.js b/web_src/fomantic/build/components/dropdown.js index d3a1f7dc24977..009b51d8b1fd9 100644 --- a/web_src/fomantic/build/components/dropdown.js +++ b/web_src/fomantic/build/components/dropdown.js @@ -1130,7 +1130,11 @@ $.fn.dropdown = function(parameters) { icon: { click: function(event) { iconClicked=true; - if(module.has.search()) { + // GITEA-PATCH: official dropdown doesn't support the search input in menu + // so we need to make the menu could be shown when the search input is in menu and user clicks the icon + const searchInputInMenu = Boolean($menu.find('.search > input').length); + if(module.has.search() && !searchInputInMenu) { + // the search input is in the dropdown element (but not in the popup menu), try to focus it if(!module.is.active()) { if(settings.showOnFocus){ module.focusSearch(); From 9576848b84049c35952366817cdbf233f46b1017 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 20 Mar 2025 16:51:06 +0800 Subject: [PATCH 10/10] fix test and comment --- models/issues/issue_search.go | 2 ++ models/issues/issue_test.go | 3 +-- modules/indexer/issues/indexer_test.go | 10 +++++----- modules/indexer/issues/internal/tests/tests.go | 8 ++++---- routers/api/v1/repo/issue.go | 2 +- routers/web/shared/user/helper.go | 1 + templates/repo/issue/filter_item_user_assign.tmpl | 5 ++--- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go index 621091d9a10f1..737b69f1547b6 100644 --- a/models/issues/issue_search.go +++ b/models/issues/issue_search.go @@ -369,6 +369,8 @@ func applyAssigneeCondition(sess *xorm.Session, assigneeID string) { } func applyPosterCondition(sess *xorm.Session, posterID string) { + // Actually every issue has a poster. + // The "(none)" is for internal usage only: when doer tries to search non-existing user as poster, use "(none)" to return empty result. if posterID == "(none)" { sess.And("issue.poster_id=0") } else if posterIDInt64, _ := strconv.ParseInt(posterID, 10, 64); posterIDInt64 > 0 { diff --git a/models/issues/issue_test.go b/models/issues/issue_test.go index 3f76a81bb65d4..c32aa26b2ba66 100644 --- a/models/issues/issue_test.go +++ b/models/issues/issue_test.go @@ -15,7 +15,6 @@ import ( repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" @@ -155,7 +154,7 @@ func TestIssues(t *testing.T) { }{ { issues_model.IssuesOptions{ - AssigneeID: optional.Some(int64(1)), + AssigneeID: "1", SortType: "oldest", }, []int64{1, 6}, diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index 4bf19e129740f..3e38ac49b719c 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -177,19 +177,19 @@ func searchIssueByID(t *testing.T) { }{ { opts: SearchOptions{ - PosterID: optional.Some(int64(1)), + PosterID: "1", }, expectedIDs: []int64{11, 6, 3, 2, 1}, }, { opts: SearchOptions{ - AssigneeID: optional.Some(int64(1)), + AssigneeID: "1", }, expectedIDs: []int64{6, 1}, }, { - // NOTE: This tests no assignees filtering and also ToSearchOptions() to ensure it will set AssigneeID to 0 when it is passed as -1. - opts: *ToSearchOptions("", &issues.IssuesOptions{AssigneeID: optional.Some(db.NoConditionID)}), + // NOTE: This tests no assignees filtering and also ToSearchOptions() to ensure it handles the filter correctly + opts: *ToSearchOptions("", &issues.IssuesOptions{AssigneeID: "(none)"}), expectedIDs: []int64{22, 21, 16, 15, 14, 13, 12, 11, 20, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2}, }, { @@ -472,7 +472,7 @@ func searchIssueWithAnyAssignee(t *testing.T) { }{ { SearchOptions{ - AnyAssigneeOnly: true, + AssigneeID: "(any)", }, []int64{17, 6, 1}, 3, diff --git a/modules/indexer/issues/internal/tests/tests.go b/modules/indexer/issues/internal/tests/tests.go index af23ec4e46fef..6e92c7885c886 100644 --- a/modules/indexer/issues/internal/tests/tests.go +++ b/modules/indexer/issues/internal/tests/tests.go @@ -379,7 +379,7 @@ var cases = []*testIndexerCase{ Paginator: &db.ListOptions{ PageSize: 5, }, - PosterID: optional.Some(int64(1)), + PosterID: "1", }, Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) { assert.Len(t, result.Hits, 5) @@ -397,7 +397,7 @@ var cases = []*testIndexerCase{ Paginator: &db.ListOptions{ PageSize: 5, }, - AssigneeID: optional.Some(int64(1)), + AssigneeID: "1", }, Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) { assert.Len(t, result.Hits, 5) @@ -415,7 +415,7 @@ var cases = []*testIndexerCase{ Paginator: &db.ListOptions{ PageSize: 5, }, - AssigneeID: optional.Some(int64(0)), + AssigneeID: "(none)", }, Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) { assert.Len(t, result.Hits, 5) @@ -650,7 +650,7 @@ var cases = []*testIndexerCase{ { Name: "SearchAnyAssignee", SearchOptions: &internal.SearchOptions{ - AnyAssigneeOnly: true, + AssigneeID: "(any)", }, Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) { assert.Len(t, result.Hits, 180) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index c0d638b0542a8..e678db526203c 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -541,7 +541,7 @@ func ListIssues(ctx *context.APIContext) { searchOpt.PosterID = strconv.FormatInt(createdByID, 10) } if assignedByID > 0 { - searchOpt.AssigneeID = strconv.FormatInt(assignedByID, 64) + searchOpt.AssigneeID = strconv.FormatInt(assignedByID, 10) } if mentionedByID > 0 { searchOpt.MentionID = optional.Some(mentionedByID) diff --git a/routers/web/shared/user/helper.go b/routers/web/shared/user/helper.go index dddfc36218258..3fc39fd3ab9b9 100644 --- a/routers/web/shared/user/helper.go +++ b/routers/web/shared/user/helper.go @@ -44,6 +44,7 @@ func GetFilterUserIDByName(ctx context.Context, name string) string { if id, err := strconv.ParseInt(name, 10, 64); err == nil { return strconv.FormatInt(id, 10) } + // The "(none)" is for internal usage only: when doer tries to search non-existing user, use "(none)" to return empty result. return "(none)" } return strconv.FormatInt(u.ID, 10) diff --git a/templates/repo/issue/filter_item_user_assign.tmpl b/templates/repo/issue/filter_item_user_assign.tmpl index c7db7bc9d8fd7..42886edaa06d8 100644 --- a/templates/repo/issue/filter_item_user_assign.tmpl +++ b/templates/repo/issue/filter_item_user_assign.tmpl @@ -4,9 +4,8 @@ * UserSearchList * SelectedUserId: 0 or empty means default, -1 means "no user is set" * TextFilterTitle -* TextZeroValue: the text for "all issues" -* TextNegativeOne: the text for "issues with no assignee" -* TextAnyCondition: the text for "issues with any assignee" +* TextFilterMatchNone: the text for "issues with no assignee" +* TextFilterMatchAny: the text for "issues with any assignee" */}} {{$queryLink := .QueryLink}}