Skip to content

Commit 661a1e1

Browse files
yp053276543wxiaoguang
authored
Fix sort order for organization home and user profile page (#31921)
Fix #31916 In #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 #29231. In #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 #29231, but the handler was not added. --------- Co-authored-by: 6543 <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
1 parent 5550226 commit 661a1e1

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
@@ -55,32 +55,12 @@ func home(ctx *context.Context, viewRepositories bool) {
5555
ctx.Data["Title"] = org.DisplayName()
5656

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

8565
keyword := ctx.FormTrim("q")
8666
ctx.Data["Keyword"] = keyword

routers/web/user/profile.go

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

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

140120
keyword := ctx.FormTrim("q")
141121
ctx.Data["Keyword"] = keyword

0 commit comments

Comments
 (0)