aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author6543 <m.huber@kithara.com>2023-11-09 11:11:45 +0100
committerGitHub <noreply@github.com>2023-11-09 10:11:45 +0000
commit16ba16dbe951763cfc026b7351e26009d1a25fdc (patch)
treee15db0f5fcc7772a914df2b8993eb8ffcd51010b
parent69d98f83f9a62a7e70976b5d973f293f73e42266 (diff)
downloadgitea-16ba16dbe951763cfc026b7351e26009d1a25fdc.tar.gz
gitea-16ba16dbe951763cfc026b7351e26009d1a25fdc.zip
Allow to set explore page default sort (#27951)
as title --- *Sponsored by Kithara Software GmbH*
-rw-r--r--custom/conf/app.example.ini4
-rw-r--r--docs/content/administration/config-cheat-sheet.en-us.md3
-rw-r--r--modules/setting/ui.go1
-rw-r--r--routers/web/admin/orgs.go2
-rw-r--r--routers/web/admin/users.go5
-rw-r--r--routers/web/explore/org.go2
-rw-r--r--routers/web/explore/repo.go9
-rw-r--r--routers/web/explore/user.go17
8 files changed, 28 insertions, 15 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index a4e777fa12..329dd34d7b 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1238,6 +1238,10 @@ LEVEL = Info
;; Whether to only show relevant repos on the explore page when no keyword is specified and default sorting is used.
;; A repo is considered irrelevant if it's a fork or if it has no metadata (no description, no icon, no topic).
;ONLY_SHOW_RELEVANT_REPOS = false
+;;
+;; Change the sort type of the explore pages.
+;; Default is "recentupdate", but you also have "alphabetically", "reverselastlogin", "newest", "oldest".
+;EXPLORE_PAGING_DEFAULT_SORT = recentupdate
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/docs/content/administration/config-cheat-sheet.en-us.md b/docs/content/administration/config-cheat-sheet.en-us.md
index 401da352c1..2da6bd3ff5 100644
--- a/docs/content/administration/config-cheat-sheet.en-us.md
+++ b/docs/content/administration/config-cheat-sheet.en-us.md
@@ -229,8 +229,9 @@ The following configuration set `Content-Type: application/vnd.android.package-a
add it to this config.
- `DEFAULT_SHOW_FULL_NAME`: **false**: Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
- `SEARCH_REPO_DESCRIPTION`: **true**: Whether to search within description at repository search on explore page.
-- `ONLY_SHOW_RELEVANT_REPOS`: **false** Whether to only show relevant repos on the explore page when no keyword is specified and default sorting is used.
+- `ONLY_SHOW_RELEVANT_REPOS`: **false**: Whether to only show relevant repos on the explore page when no keyword is specified and default sorting is used.
A repo is considered irrelevant if it's a fork or if it has no metadata (no description, no icon, no topic).
+- `EXPLORE_PAGING_DEFAULT_SORT`: **recentupdate**: Change the sort type of the explore pages. Valid values are "recentupdate", "alphabetically", "reverselastlogin", "newest" and "oldest"
### UI - Admin (`ui.admin`)
diff --git a/modules/setting/ui.go b/modules/setting/ui.go
index 231698bf60..31042d3ee0 100644
--- a/modules/setting/ui.go
+++ b/modules/setting/ui.go
@@ -33,6 +33,7 @@ var UI = struct {
CustomEmojisMap map[string]string `ini:"-"`
SearchRepoDescription bool
OnlyShowRelevantRepos bool
+ ExploreDefaultSort string `ini:"EXPLORE_PAGING_DEFAULT_SORT"`
Notification struct {
MinTimeout time.Duration
diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go
index ab44f8048b..00131c9e2f 100644
--- a/routers/web/admin/orgs.go
+++ b/routers/web/admin/orgs.go
@@ -24,7 +24,7 @@ func Organizations(ctx *context.Context) {
ctx.Data["PageIsAdminOrganizations"] = true
if ctx.FormString("sort") == "" {
- ctx.SetFormString("sort", explore.UserSearchDefaultAdminSort)
+ ctx.SetFormString("sort", UserSearchDefaultAdminSort)
}
explore.RenderUserSearch(ctx, &user_model.SearchUserOptions{
diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go
index 630d739836..58120818b0 100644
--- a/routers/web/admin/users.go
+++ b/routers/web/admin/users.go
@@ -37,6 +37,9 @@ const (
tplUserEdit base.TplName = "admin/user/edit"
)
+// UserSearchDefaultAdminSort is the default sort type for admin view
+const UserSearchDefaultAdminSort = "alphabetically"
+
// Users show all the users
func Users(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("admin.users")
@@ -56,7 +59,7 @@ func Users(ctx *context.Context) {
sortType := ctx.FormString("sort")
if sortType == "" {
- sortType = explore.UserSearchDefaultAdminSort
+ sortType = UserSearchDefaultAdminSort
ctx.SetFormString("sort", sortType)
}
ctx.PageData["adminUserListSearchForm"] = map[string]any{
diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go
index e37bce6b40..dc1318beef 100644
--- a/routers/web/explore/org.go
+++ b/routers/web/explore/org.go
@@ -25,7 +25,7 @@ func Organizations(ctx *context.Context) {
}
if ctx.FormString("sort") == "" {
- ctx.SetFormString("sort", UserSearchDefaultSortType)
+ ctx.SetFormString("sort", setting.UI.ExploreDefaultSort)
}
RenderUserSearch(ctx, &user_model.SearchUserOptions{
diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index e5f7977abd..0446edebe6 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -57,8 +57,13 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
orderBy db.SearchOrderBy
)
- ctx.Data["SortType"] = ctx.FormString("sort")
- switch ctx.FormString("sort") {
+ sortOrder := ctx.FormString("sort")
+ if sortOrder == "" {
+ sortOrder = setting.UI.ExploreDefaultSort
+ }
+ ctx.Data["SortType"] = sortOrder
+
+ switch sortOrder {
case "newest":
orderBy = db.SearchOrderByNewest
case "oldest":
diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go
index c760004088..09d31f95ef 100644
--- a/routers/web/explore/user.go
+++ b/routers/web/explore/user.go
@@ -23,12 +23,6 @@ const (
tplExploreUsers base.TplName = "explore/users"
)
-// UserSearchDefaultSortType is the default sort type for user search
-const (
- UserSearchDefaultSortType = "recentupdate"
- UserSearchDefaultAdminSort = "alphabetically"
-)
-
var nullByte = []byte{0x00}
func isKeywordValid(keyword string) bool {
@@ -60,8 +54,13 @@ func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions,
// we can not set orderBy to `models.SearchOrderByXxx`, because there may be a JOIN in the statement, different tables may have the same name columns
- ctx.Data["SortType"] = ctx.FormString("sort")
- switch ctx.FormString("sort") {
+ sortOrder := ctx.FormString("sort")
+ if sortOrder == "" {
+ sortOrder = setting.UI.ExploreDefaultSort
+ }
+ ctx.Data["SortType"] = sortOrder
+
+ switch sortOrder {
case "newest":
orderBy = "`user`.id DESC"
case "oldest":
@@ -134,7 +133,7 @@ func Users(ctx *context.Context) {
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
if ctx.FormString("sort") == "" {
- ctx.SetFormString("sort", UserSearchDefaultSortType)
+ ctx.SetFormString("sort", setting.UI.ExploreDefaultSort)
}
RenderUserSearch(ctx, &user_model.SearchUserOptions{