diff --git a/routers/home.go b/routers/home.go index 381bdd20a..94c570b6c 100644 --- a/routers/home.go +++ b/routers/home.go @@ -88,9 +88,11 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { err error orderBy models.SearchOrderBy ) - ctx.Data["SortType"] = ctx.Query("sort") + ctx.Data["SortType"] = ctx.Query("sort") switch ctx.Query("sort") { + case "newest": + orderBy = models.SearchOrderByNewest case "oldest": orderBy = models.SearchOrderByOldest case "recentupdate": @@ -106,7 +108,8 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { case "size": orderBy = models.SearchOrderBySize default: - orderBy = models.SearchOrderByNewest + ctx.Data["SortType"] = "recentupdate" + orderBy = models.SearchOrderByRecentUpdated } keyword := strings.Trim(ctx.Query("q"), " ") @@ -188,6 +191,8 @@ func RenderUserSearch(ctx *context.Context, opts *UserSearchOptions) { ctx.Data["SortType"] = ctx.Query("sort") switch ctx.Query("sort") { + case "newest": + orderBy = "id DESC" case "oldest": orderBy = "id ASC" case "recentupdate": @@ -199,7 +204,8 @@ func RenderUserSearch(ctx *context.Context, opts *UserSearchOptions) { case "alphabetically": orderBy = "name ASC" default: - orderBy = "id DESC" + ctx.Data["SortType"] = "alphabetically" + orderBy = "name ASC" } keyword := strings.Trim(ctx.Query("q"), " ") diff --git a/routers/user/profile.go b/routers/user/profile.go index 50d0c2397..b0eab0933 100644 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -126,12 +126,7 @@ func Profile(ctx *context.Context) { orderBy = models.SearchOrderByAlphabetically default: ctx.Data["SortType"] = "recentupdate" - orderBy = models.SearchOrderByNewest - } - - // set default sort value if sort is empty. - if ctx.Query("sort") == "" { - ctx.Data["SortType"] = "recentupdate" + orderBy = models.SearchOrderByRecentUpdated } keyword := strings.Trim(ctx.Query("q"), " ") diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 8cd6f9b2f..dbf0b15e7 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -6,7 +6,7 @@