From 440b81c6b80615130b6a08f90441bc4e3be1ecdf Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 6 May 2024 21:58:48 +0200 Subject: [PATCH 1/2] Repository explore alphabetically order respect owner name too --- models/db/search.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/db/search.go b/models/db/search.go index aa577f08e0439..66769463cb4d0 100644 --- a/models/db/search.go +++ b/models/db/search.go @@ -12,8 +12,8 @@ func (s SearchOrderBy) String() string { // Strings for sorting result const ( - SearchOrderByAlphabetically SearchOrderBy = "name ASC" - SearchOrderByAlphabeticallyReverse SearchOrderBy = "name DESC" + SearchOrderByAlphabetically SearchOrderBy = "owner_name ASC, name ASC" + SearchOrderByAlphabeticallyReverse SearchOrderBy = "owner_name DESC, name DESC" SearchOrderByLeastUpdated SearchOrderBy = "updated_unix ASC" SearchOrderByRecentUpdated SearchOrderBy = "updated_unix DESC" SearchOrderByOldest SearchOrderBy = "created_unix ASC" From 2d78474c83f3d2de1dd3ecb555fb6573460fa8bd Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 6 May 2024 22:02:36 +0200 Subject: [PATCH 2/2] only affect repo explore --- models/db/search.go | 4 ++-- routers/web/explore/repo.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/db/search.go b/models/db/search.go index 66769463cb4d0..aa577f08e0439 100644 --- a/models/db/search.go +++ b/models/db/search.go @@ -12,8 +12,8 @@ func (s SearchOrderBy) String() string { // Strings for sorting result const ( - SearchOrderByAlphabetically SearchOrderBy = "owner_name ASC, name ASC" - SearchOrderByAlphabeticallyReverse SearchOrderBy = "owner_name DESC, name DESC" + SearchOrderByAlphabetically SearchOrderBy = "name ASC" + SearchOrderByAlphabeticallyReverse SearchOrderBy = "name DESC" SearchOrderByLeastUpdated SearchOrderBy = "updated_unix ASC" SearchOrderByRecentUpdated SearchOrderBy = "updated_unix DESC" SearchOrderByOldest SearchOrderBy = "created_unix ASC" diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index 66477a255cccc..764c226d40ba0 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -71,9 +71,9 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { case "leastupdate": orderBy = db.SearchOrderByLeastUpdated case "reversealphabetically": - orderBy = db.SearchOrderByAlphabeticallyReverse + orderBy = "owner_name DESC, name DESC" case "alphabetically": - orderBy = db.SearchOrderByAlphabetically + orderBy = "owner_name ASC, name ASC" case "reversesize": orderBy = db.SearchOrderBySizeReverse case "size":