Skip to content

Commit 5a0bc35

Browse files
yp053276543wxiaoguang
authored andcommitted
Fix sort order for organization home and user profile page (go-gitea#31921)
Fix go-gitea#31916 In go-gitea#30876, `sortOrder` has been changed into a map, but it is only implemented in explore. ~~But it seems that size sort order has no effect from long long ago,~~ not directly caused by the PR above. I think it is still caused by go-gitea#29231. In go-gitea#29231, it merged the sort orders from `templates/explore/repo_search.tmpl` and `templates/admin/repo/search.tmpl`. In `templates/admin/repo/search.tmpl`, it contains size sort orders, but not in `templates/explore/repo_search.tmpl`, which is used in non-admin pages. So `order by size` is added from go-gitea#29231, but the handler was not added. --------- Co-authored-by: 6543 <[email protected]> Co-authored-by: wxiaoguang <[email protected]> (cherry picked from commit 661a1e1)
1 parent 3ad20e2 commit 5a0bc35

File tree

2 files changed

+10
-50
lines changed

2 files changed

+10
-50
lines changed

routers/web/org/home.go

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,32 +48,12 @@ func Home(ctx *context.Context) {
4848
ctx.Data["Title"] = org.DisplayName()
4949

5050
var orderBy db.SearchOrderBy
51-
ctx.Data["SortType"] = ctx.FormString("sort")
52-
switch ctx.FormString("sort") {
53-
case "newest":
54-
orderBy = db.SearchOrderByNewest
55-
case "oldest":
56-
orderBy = db.SearchOrderByOldest
57-
case "recentupdate":
58-
orderBy = db.SearchOrderByRecentUpdated
59-
case "leastupdate":
60-
orderBy = db.SearchOrderByLeastUpdated
61-
case "reversealphabetically":
62-
orderBy = db.SearchOrderByAlphabeticallyReverse
63-
case "alphabetically":
64-
orderBy = db.SearchOrderByAlphabetically
65-
case "moststars":
66-
orderBy = db.SearchOrderByStarsReverse
67-
case "feweststars":
68-
orderBy = db.SearchOrderByStars
69-
case "mostforks":
70-
orderBy = db.SearchOrderByForksReverse
71-
case "fewestforks":
72-
orderBy = db.SearchOrderByForks
73-
default:
74-
ctx.Data["SortType"] = "recentupdate"
75-
orderBy = db.SearchOrderByRecentUpdated
51+
sortOrder := ctx.FormString("sort")
52+
if _, ok := repo_model.OrderByFlatMap[sortOrder]; !ok {
53+
sortOrder = setting.UI.ExploreDefaultSort // TODO: add new default sort order for org home?
7654
}
55+
ctx.Data["SortType"] = sortOrder
56+
orderBy = repo_model.OrderByFlatMap[sortOrder]
7757

7858
keyword := ctx.FormTrim("q")
7959
ctx.Data["Keyword"] = keyword

routers/web/user/profile.go

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -112,32 +112,12 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
112112
orderBy db.SearchOrderBy
113113
)
114114

115-
ctx.Data["SortType"] = ctx.FormString("sort")
116-
switch ctx.FormString("sort") {
117-
case "newest":
118-
orderBy = db.SearchOrderByNewest
119-
case "oldest":
120-
orderBy = db.SearchOrderByOldest
121-
case "recentupdate":
122-
orderBy = db.SearchOrderByRecentUpdated
123-
case "leastupdate":
124-
orderBy = db.SearchOrderByLeastUpdated
125-
case "reversealphabetically":
126-
orderBy = db.SearchOrderByAlphabeticallyReverse
127-
case "alphabetically":
128-
orderBy = db.SearchOrderByAlphabetically
129-
case "moststars":
130-
orderBy = db.SearchOrderByStarsReverse
131-
case "feweststars":
132-
orderBy = db.SearchOrderByStars
133-
case "mostforks":
134-
orderBy = db.SearchOrderByForksReverse
135-
case "fewestforks":
136-
orderBy = db.SearchOrderByForks
137-
default:
138-
ctx.Data["SortType"] = "recentupdate"
139-
orderBy = db.SearchOrderByRecentUpdated
115+
sortOrder := ctx.FormString("sort")
116+
if _, ok := repo_model.OrderByFlatMap[sortOrder]; !ok {
117+
sortOrder = setting.UI.ExploreDefaultSort // TODO: add new default sort order for org home?
140118
}
119+
ctx.Data["SortType"] = sortOrder
120+
orderBy = repo_model.OrderByFlatMap[sortOrder]
141121

142122
keyword := ctx.FormTrim("q")
143123
ctx.Data["Keyword"] = keyword

0 commit comments

Comments
 (0)