Merge branch 'main' into fix-user-project-menu

GiteaBot · web-flow · commit 195c8f678a4c · 2024-10-30T20:33:44.000+08:00
diff --git 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
@@ -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)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"code.gitea.io/gitea/modules/container"`
`10`	`10`	`"code.gitea.io/gitea/modules/setting"`
`11`	`11`	`"code.gitea.io/gitea/modules/structs"`
	`12`	`+ "code.gitea.io/gitea/modules/util"`
`12`	`13`	`"code.gitea.io/gitea/services/context"`
`13`	`14`	`)`
`14`	`15`
`@@ -39,7 +40,7 @@ func Organizations(ctx *context.Context) {`
`39`	`40`	`)`
`40`	`41`	`sortOrder := ctx.FormString("sort")`
`41`	`42`	`if sortOrder == "" {`
`42`		`- sortOrder = "newest"`
	`43`	`+ sortOrder = util.Iif(supportedSortOrders.Contains(setting.UI.ExploreDefaultSort), setting.UI.ExploreDefaultSort, "newest")`
`43`	`44`	`ctx.SetFormString("sort", sortOrder)`
`44`	`45`	`}`
`45`	`46`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`"code.gitea.io/gitea/modules/setting"`
`17`	`17`	`"code.gitea.io/gitea/modules/sitemap"`
`18`	`18`	`"code.gitea.io/gitea/modules/structs"`
	`19`	`+ "code.gitea.io/gitea/modules/util"`
`19`	`20`	`"code.gitea.io/gitea/services/context"`
`20`	`21`	`)`
`21`	`22`
`@@ -149,7 +150,7 @@ func Users(ctx *context.Context) {`
`149`	`150`	`)`
`150`	`151`	`sortOrder := ctx.FormString("sort")`
`151`	`152`	`if sortOrder == "" {`
`152`		`- sortOrder = "newest"`
	`153`	`+ sortOrder = util.Iif(supportedSortOrders.Contains(setting.UI.ExploreDefaultSort), setting.UI.ExploreDefaultSort, "newest")`
`153`	`154`	`ctx.SetFormString("sort", sortOrder)`
`154`	`155`	`}`
`155`	`156`