From a5d39ef2751537368b2d7e6349c612959117be51 Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Mon, 22 Apr 2024 03:25:17 -0700 Subject: [PATCH 1/3] Perform Newest sort type correctly when sorting issues --- modules/indexer/issues/dboptions.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go index 4a98b4588a3da..e7f0b291fea33 100644 --- a/modules/indexer/issues/dboptions.go +++ b/modules/indexer/issues/dboptions.go @@ -68,8 +68,6 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp searchOpt.Paginator = opts.Paginator switch opts.SortType { - case "": - searchOpt.SortBy = SortByCreatedDesc case "oldest": searchOpt.SortBy = SortByCreatedAsc case "recentupdate": @@ -87,8 +85,9 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp case "priority", "priorityrepo", "project-column-sorting": // Unsupported sort type for search searchOpt.SortBy = SortByUpdatedDesc + case "latest": default: - searchOpt.SortBy = SortByUpdatedDesc + searchOpt.SortBy = SortByCreatedDesc } return searchOpt From 413672824dfe3273ffc0b4651aa707c20f15ae5c Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Mon, 22 Apr 2024 03:39:44 -0700 Subject: [PATCH 2/3] Add missing fallthrough --- modules/indexer/issues/dboptions.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go index e7f0b291fea33..2fcf53037f12a 100644 --- a/modules/indexer/issues/dboptions.go +++ b/modules/indexer/issues/dboptions.go @@ -86,6 +86,7 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp // Unsupported sort type for search searchOpt.SortBy = SortByUpdatedDesc case "latest": + fallthrough default: searchOpt.SortBy = SortByCreatedDesc } From d7b008ae3c08d05d36bd05dab9c1b24bda77edab Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Mon, 22 Apr 2024 23:13:29 -0700 Subject: [PATCH 3/3] Don't change the default block and replace a line with a fallthrough --- modules/indexer/issues/dboptions.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/indexer/issues/dboptions.go b/modules/indexer/issues/dboptions.go index 2fcf53037f12a..8f94088742291 100644 --- a/modules/indexer/issues/dboptions.go +++ b/modules/indexer/issues/dboptions.go @@ -68,6 +68,8 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp searchOpt.Paginator = opts.Paginator switch opts.SortType { + case "", "latest": + searchOpt.SortBy = SortByCreatedDesc case "oldest": searchOpt.SortBy = SortByCreatedAsc case "recentupdate": @@ -84,11 +86,9 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp searchOpt.SortBy = SortByDeadlineDesc case "priority", "priorityrepo", "project-column-sorting": // Unsupported sort type for search - searchOpt.SortBy = SortByUpdatedDesc - case "latest": fallthrough default: - searchOpt.SortBy = SortByCreatedDesc + searchOpt.SortBy = SortByUpdatedDesc } return searchOpt