From a72b98d72dee462b19a56445033370d0445bc032 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 26 Aug 2024 01:50:45 +0000 Subject: [PATCH 1/4] fix --- routers/web/org/home.go | 36 ++++++++++++------------------------ routers/web/user/profile.go | 35 +++++++++++------------------------ 2 files changed, 23 insertions(+), 48 deletions(-) diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 77d49f5b78fd0..e63dfef841d62 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -48,32 +48,20 @@ func Home(ctx *context.Context) { ctx.Data["Title"] = org.DisplayName() var orderBy db.SearchOrderBy - ctx.Data["SortType"] = ctx.FormString("sort") - switch ctx.FormString("sort") { - case "newest": - 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" + + sortOrder := strings.ToLower(ctx.FormString("sort")) + if sortOrder == "" { + // TODO: add new default sort for org home? + sortOrder = setting.UI.ExploreDefaultSort + } + + if order, ok := repo_model.OrderByFlatMap[sortOrder]; ok { + orderBy = order + } else { + sortOrder = "recentupdate" orderBy = db.SearchOrderByRecentUpdated } + ctx.Data["SortType"] = sortOrder keyword := ctx.FormTrim("q") ctx.Data["Keyword"] = keyword diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 3f91233ee6ee6..dc02e900a541b 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -110,32 +110,19 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb orderBy db.SearchOrderBy ) - ctx.Data["SortType"] = ctx.FormString("sort") - switch ctx.FormString("sort") { - case "newest": - 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" + sortOrder := strings.ToLower(ctx.FormString("sort")) + if sortOrder == "" { + // TODO: add new default sort for user profile? + sortOrder = setting.UI.ExploreDefaultSort + } + + if order, ok := repo_model.OrderByFlatMap[sortOrder]; ok { + orderBy = order + } else { + sortOrder = "recentupdate" orderBy = db.SearchOrderByRecentUpdated } + ctx.Data["SortType"] = sortOrder keyword := ctx.FormTrim("q") ctx.Data["Keyword"] = keyword From 456b85af143b7cd8cdce3aff790205642d60da4a Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 26 Aug 2024 01:54:23 +0000 Subject: [PATCH 2/4] fix comment --- routers/web/org/home.go | 2 +- routers/web/user/profile.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/org/home.go b/routers/web/org/home.go index e63dfef841d62..d43355a284319 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -51,7 +51,7 @@ func Home(ctx *context.Context) { sortOrder := strings.ToLower(ctx.FormString("sort")) if sortOrder == "" { - // TODO: add new default sort for org home? + // TODO: add new default sort order for org home? sortOrder = setting.UI.ExploreDefaultSort } diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index dc02e900a541b..8457eef119235 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -112,7 +112,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb sortOrder := strings.ToLower(ctx.FormString("sort")) if sortOrder == "" { - // TODO: add new default sort for user profile? + // TODO: add new default sort order for user profile? sortOrder = setting.UI.ExploreDefaultSort } From 5347df542c4a95c04688e1503cbafd4fa225bb1d Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 1 Sep 2024 18:23:01 +0200 Subject: [PATCH 3/4] Update routers/web/org/home.go Co-authored-by: wxiaoguang --- routers/web/org/home.go | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/routers/web/org/home.go b/routers/web/org/home.go index d43355a284319..157926ceb4b86 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -48,20 +48,12 @@ func Home(ctx *context.Context) { ctx.Data["Title"] = org.DisplayName() var orderBy db.SearchOrderBy - - sortOrder := strings.ToLower(ctx.FormString("sort")) - if sortOrder == "" { - // TODO: add new default sort order for org home? - sortOrder = setting.UI.ExploreDefaultSort - } - - if order, ok := repo_model.OrderByFlatMap[sortOrder]; ok { - orderBy = order - } else { - sortOrder = "recentupdate" - orderBy = db.SearchOrderByRecentUpdated + sortOrder := ctx.FormString("sort") + if _, ok := repo_model.OrderByFlatMap[sortOrder]; !ok { + sortOrder = setting.UI.ExploreDefaultSort // TODO: add new default sort order for org home? } ctx.Data["SortType"] = sortOrder + orderBy = repo_model.OrderByFlatMap[sortOrder] keyword := ctx.FormTrim("q") ctx.Data["Keyword"] = keyword From cd268b48767525bd238ab611e4563579cc769a7b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 1 Sep 2024 18:26:46 +0200 Subject: [PATCH 4/4] Update routers/web/user/profile.go --- routers/web/user/profile.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 8457eef119235..39c6d23079699 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -110,19 +110,12 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb orderBy db.SearchOrderBy ) - sortOrder := strings.ToLower(ctx.FormString("sort")) - if sortOrder == "" { - // TODO: add new default sort order for user profile? - sortOrder = setting.UI.ExploreDefaultSort - } - - if order, ok := repo_model.OrderByFlatMap[sortOrder]; ok { - orderBy = order - } else { - sortOrder = "recentupdate" - orderBy = db.SearchOrderByRecentUpdated + sortOrder := ctx.FormString("sort") + if _, ok := repo_model.OrderByFlatMap[sortOrder]; !ok { + sortOrder = setting.UI.ExploreDefaultSort // TODO: add new default sort order for org home? } ctx.Data["SortType"] = sortOrder + orderBy = repo_model.OrderByFlatMap[sortOrder] keyword := ctx.FormTrim("q") ctx.Data["Keyword"] = keyword