mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	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 <6543@obermui.de> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		| @@ -55,32 +55,12 @@ func home(ctx *context.Context, viewRepositories bool) { | |||||||
| 	ctx.Data["Title"] = org.DisplayName() | 	ctx.Data["Title"] = org.DisplayName() | ||||||
|  |  | ||||||
| 	var orderBy db.SearchOrderBy | 	var orderBy db.SearchOrderBy | ||||||
| 	ctx.Data["SortType"] = ctx.FormString("sort") | 	sortOrder := ctx.FormString("sort") | ||||||
| 	switch ctx.FormString("sort") { | 	if _, ok := repo_model.OrderByFlatMap[sortOrder]; !ok { | ||||||
| 	case "newest": | 		sortOrder = setting.UI.ExploreDefaultSort // TODO: add new default sort order for org home? | ||||||
| 		orderBy = db.SearchOrderByNewest |  | ||||||
| 	case "oldest": |  | ||||||
| 		orderBy = db.SearchOrderByOldest |  | ||||||
| 	case "recentupdate": |  | ||||||
| 		orderBy = db.SearchOrderByRecentUpdated |  | ||||||
| 	case "leastupdate": |  | ||||||
| 		orderBy = db.SearchOrderByLeastUpdated |  | ||||||
| 	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 |  | ||||||
| 	} | 	} | ||||||
|  | 	ctx.Data["SortType"] = sortOrder | ||||||
|  | 	orderBy = repo_model.OrderByFlatMap[sortOrder] | ||||||
|  |  | ||||||
| 	keyword := ctx.FormTrim("q") | 	keyword := ctx.FormTrim("q") | ||||||
| 	ctx.Data["Keyword"] = keyword | 	ctx.Data["Keyword"] = keyword | ||||||
|   | |||||||
| @@ -110,32 +110,12 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb | |||||||
| 		orderBy db.SearchOrderBy | 		orderBy db.SearchOrderBy | ||||||
| 	) | 	) | ||||||
|  |  | ||||||
| 	ctx.Data["SortType"] = ctx.FormString("sort") | 	sortOrder := ctx.FormString("sort") | ||||||
| 	switch ctx.FormString("sort") { | 	if _, ok := repo_model.OrderByFlatMap[sortOrder]; !ok { | ||||||
| 	case "newest": | 		sortOrder = setting.UI.ExploreDefaultSort // TODO: add new default sort order for org home? | ||||||
| 		orderBy = db.SearchOrderByNewest |  | ||||||
| 	case "oldest": |  | ||||||
| 		orderBy = db.SearchOrderByOldest |  | ||||||
| 	case "recentupdate": |  | ||||||
| 		orderBy = db.SearchOrderByRecentUpdated |  | ||||||
| 	case "leastupdate": |  | ||||||
| 		orderBy = db.SearchOrderByLeastUpdated |  | ||||||
| 	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 |  | ||||||
| 	} | 	} | ||||||
|  | 	ctx.Data["SortType"] = sortOrder | ||||||
|  | 	orderBy = repo_model.OrderByFlatMap[sortOrder] | ||||||
|  |  | ||||||
| 	keyword := ctx.FormTrim("q") | 	keyword := ctx.FormTrim("q") | ||||||
| 	ctx.Data["Keyword"] = keyword | 	ctx.Data["Keyword"] = keyword | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user