This commit is contained in:
yp05327 2024-08-26 01:50:45 +00:00
parent d477dd5e88
commit a72b98d72d
2 changed files with 23 additions and 48 deletions

View File

@ -48,32 +48,20 @@ func Home(ctx *context.Context) {
ctx.Data["Title"] = org.DisplayName() ctx.Data["Title"] = org.DisplayName()
var orderBy db.SearchOrderBy var orderBy db.SearchOrderBy
ctx.Data["SortType"] = ctx.FormString("sort")
switch ctx.FormString("sort") { sortOrder := strings.ToLower(ctx.FormString("sort"))
case "newest": if sortOrder == "" {
orderBy = db.SearchOrderByNewest // TODO: add new default sort for org home?
case "oldest": sortOrder = setting.UI.ExploreDefaultSort
orderBy = db.SearchOrderByOldest }
case "recentupdate":
orderBy = db.SearchOrderByRecentUpdated if order, ok := repo_model.OrderByFlatMap[sortOrder]; ok {
case "leastupdate": orderBy = order
orderBy = db.SearchOrderByLeastUpdated } else {
case "reversealphabetically": sortOrder = "recentupdate"
orderBy = db.SearchOrderByAlphabeticallyReverse
case "alphabetically":
orderBy = db.SearchOrderByAlphabetically
case "moststars":
orderBy = db.SearchOrderByStarsReverse
case "feweststars":
orderBy = db.SearchOrderByStars
case "mostforks":
orderBy = db.SearchOrderByForksReverse
case "fewestforks":
orderBy = db.SearchOrderByForks
default:
ctx.Data["SortType"] = "recentupdate"
orderBy = db.SearchOrderByRecentUpdated orderBy = db.SearchOrderByRecentUpdated
} }
ctx.Data["SortType"] = sortOrder
keyword := ctx.FormTrim("q") keyword := ctx.FormTrim("q")
ctx.Data["Keyword"] = keyword ctx.Data["Keyword"] = keyword

View File

@ -110,32 +110,19 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
orderBy db.SearchOrderBy orderBy db.SearchOrderBy
) )
ctx.Data["SortType"] = ctx.FormString("sort") sortOrder := strings.ToLower(ctx.FormString("sort"))
switch ctx.FormString("sort") { if sortOrder == "" {
case "newest": // TODO: add new default sort for user profile?
orderBy = db.SearchOrderByNewest sortOrder = setting.UI.ExploreDefaultSort
case "oldest": }
orderBy = db.SearchOrderByOldest
case "recentupdate": if order, ok := repo_model.OrderByFlatMap[sortOrder]; ok {
orderBy = db.SearchOrderByRecentUpdated orderBy = order
case "leastupdate": } else {
orderBy = db.SearchOrderByLeastUpdated sortOrder = "recentupdate"
case "reversealphabetically":
orderBy = db.SearchOrderByAlphabeticallyReverse
case "alphabetically":
orderBy = db.SearchOrderByAlphabetically
case "moststars":
orderBy = db.SearchOrderByStarsReverse
case "feweststars":
orderBy = db.SearchOrderByStars
case "mostforks":
orderBy = db.SearchOrderByForksReverse
case "fewestforks":
orderBy = db.SearchOrderByForks
default:
ctx.Data["SortType"] = "recentupdate"
orderBy = db.SearchOrderByRecentUpdated orderBy = db.SearchOrderByRecentUpdated
} }
ctx.Data["SortType"] = sortOrder
keyword := ctx.FormTrim("q") keyword := ctx.FormTrim("q")
ctx.Data["Keyword"] = keyword ctx.Data["Keyword"] = keyword