Change default sort order (#2647)

* sort repositories by `updated_unix` in Explore

* Fix UI problem

* Added missing sort order "newest"

* Change default sort order

* fmt

diff --git a/routers/home.go b/routers/home.go
index 381bdd20ae12a75cf948e1e37280e2577515d1e1..94c570b6ce057ff38d4c13549ed778e6f9487b21 100644 (file)
--- 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 50d0c2397fbbb6ad32377db8774c8478df70268d..b0eab093337126adaf294c00930066713d4a03eb 100644 (file)
--- 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 8cd6f9b2f585e081fe51342208d5b27728dbb5d4..dbf0b15e7aa4a8417a9d4db51675c58f32108df5 100644 (file)
--- a/templates/explore/search.tmpl
+++ b/templates/explore/search.tmpl
@@ -6,7 +6,7 @@
                        <i class="dropdown icon"></i>
                </span>
                <div class="menu">
-                       <a class="{{if or (eq .SortType "newest") (not .SortType)}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
+                       <a class="{{if eq .SortType "newest"}}active{{end}} item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a>
                        <a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a>
                        <a class="{{if eq .SortType "alphabetically"}}active{{end}} item" href="{{$.Link}}?sort=alphabetically&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
                        <a class="{{if eq .SortType "reversealphabetically"}}active{{end}} item" href="{{$.Link}}?sort=reversealphabetically&q={{$.Keyword}}&tab={{$.TabName}}">{{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>