diff options
| author | 6543 <6543@obermui.de> | 2024-10-30 13:33:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-30 12:33:25 +0000 |
| commit | 58eb16eda74379a9d40bc986745a5443357bb18d (patch) | |
| tree | e391cfcf697f43dc74503ed02b1144304dc4f119 | |
| parent | ce4d909bd693fe903761eb835f7661e476a937ca (diff) | |
| download | gitea-58eb16eda74379a9d40bc986745a5443357bb18d.tar.gz gitea-58eb16eda74379a9d40bc986745a5443357bb18d.zip | |
Respect UI.ExploreDefaultSort setting again (#32357)
fix regression of https://github.com/go-gitea/gitea/pull/29430
---
*Sponsored by Kithara Software GmbH*
| -rw-r--r-- | routers/web/explore/org.go | 3 | ||||
| -rw-r--r-- | 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 7178630b64..7bb71acfd7 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 = "newest" + 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 5f6b8fcee6..c009982d42 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 = "newest" + sortOrder = util.Iif(supportedSortOrders.Contains(setting.UI.ExploreDefaultSort), setting.UI.ExploreDefaultSort, "newest") ctx.SetFormString("sort", sortOrder) } |