From cf26af68edeacfe7575084f5e0be708fc9e85550 Mon Sep 17 00:00:00 2001 From: "m.huber" Date: Mon, 28 Oct 2024 17:57:11 +0100 Subject: [PATCH 1/2] Respect UI.ExploreDefaultSort setting again fix regression of https://github.com/go-gitea/gitea/pull/29430 --- routers/web/explore/org.go | 2 +- routers/web/explore/user.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go index 7178630b64e95..6adfcfebbfd61 100644 --- a/routers/web/explore/org.go +++ b/routers/web/explore/org.go @@ -39,7 +39,7 @@ func Organizations(ctx *context.Context) { ) sortOrder := ctx.FormString("sort") if sortOrder == "" { - sortOrder = "newest" + sortOrder = setting.UI.ExploreDefaultSort ctx.SetFormString("sort", sortOrder) } diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index 5f6b8fcee6103..32ec95df9ca4b 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -149,7 +149,7 @@ func Users(ctx *context.Context) { ) sortOrder := ctx.FormString("sort") if sortOrder == "" { - sortOrder = "newest" + sortOrder = setting.UI.ExploreDefaultSort ctx.SetFormString("sort", sortOrder) } From aae39fb99f77bed1c47753b92d9f4a3e1f4bc06b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 29 Oct 2024 12:53:24 +0100 Subject: [PATCH 2/2] inline if --- routers/web/explore/org.go | 3 ++- routers/web/explore/user.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go index 6adfcfebbfd61..7bb71acfd78e0 100644 --- a/routers/web/explore/org.go +++ b/routers/web/explore/org.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/context" ) @@ -39,7 +40,7 @@ func Organizations(ctx *context.Context) { ) sortOrder := ctx.FormString("sort") if sortOrder == "" { - sortOrder = setting.UI.ExploreDefaultSort + sortOrder = util.Iif(supportedSortOrders.Contains(setting.UI.ExploreDefaultSort), setting.UI.ExploreDefaultSort, "newest") ctx.SetFormString("sort", sortOrder) } diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index 32ec95df9ca4b..c009982d420ce 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/sitemap" "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/context" ) @@ -149,7 +150,7 @@ func Users(ctx *context.Context) { ) sortOrder := ctx.FormString("sort") if sortOrder == "" { - sortOrder = setting.UI.ExploreDefaultSort + sortOrder = util.Iif(supportedSortOrders.Contains(setting.UI.ExploreDefaultSort), setting.UI.ExploreDefaultSort, "newest") ctx.SetFormString("sort", sortOrder) }