From d16e6a5d477184ea0eb2122aac2b5fbabcb58754 Mon Sep 17 00:00:00 2001 From: Kazuki Sawada Date: Tue, 3 Oct 2017 14:39:32 +0900 Subject: [PATCH 1/7] sort repositories by `updated_unix` in Explore --- routers/home.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/home.go b/routers/home.go index 381bdd20ae12a..c0550619e27a9 100644 --- a/routers/home.go +++ b/routers/home.go @@ -199,7 +199,7 @@ func RenderUserSearch(ctx *context.Context, opts *UserSearchOptions) { case "alphabetically": orderBy = "name ASC" default: - orderBy = "id DESC" + orderBy = "updated_unix DESC" } keyword := strings.Trim(ctx.Query("q"), " ") From 443ea9529f0f1ff8d0668ff6cc14f387059c2ad9 Mon Sep 17 00:00:00 2001 From: Kazuki Sawada Date: Wed, 4 Oct 2017 17:15:06 +0900 Subject: [PATCH 2/7] Revert "sort repositories by `updated_unix` in Explore" This reverts commit d16e6a5d477184ea0eb2122aac2b5fbabcb58754. --- routers/home.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/home.go b/routers/home.go index c0550619e27a9..381bdd20ae12a 100644 --- a/routers/home.go +++ b/routers/home.go @@ -199,7 +199,7 @@ func RenderUserSearch(ctx *context.Context, opts *UserSearchOptions) { case "alphabetically": orderBy = "name ASC" default: - orderBy = "updated_unix DESC" + orderBy = "id DESC" } keyword := strings.Trim(ctx.Query("q"), " ") From ff5b278991362fa9f3d339cef6b9a4eb899da9c9 Mon Sep 17 00:00:00 2001 From: Kazuki Sawada Date: Wed, 4 Oct 2017 17:20:35 +0900 Subject: [PATCH 3/7] sort repositories by `updated_unix` in Explore --- routers/home.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/home.go b/routers/home.go index 381bdd20ae12a..0427f318840b2 100644 --- a/routers/home.go +++ b/routers/home.go @@ -106,7 +106,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { case "size": orderBy = models.SearchOrderBySize default: - orderBy = models.SearchOrderByNewest + orderBy = models.SearchOrderByRecentUpdated } keyword := strings.Trim(ctx.Query("q"), " ") From 06989a9f70c0c17f9fbc580a899fd7ebd2305cf5 Mon Sep 17 00:00:00 2001 From: Kazuki Sawada Date: Thu, 5 Oct 2017 01:09:47 +0900 Subject: [PATCH 4/7] Fix UI problem --- templates/explore/search.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index 8cd6f9b2f585e..67cd201e09565 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -6,11 +6,11 @@
- {{.i18n.Tr "repo.issues.filter_sort.latest"}} + {{.i18n.Tr "repo.issues.filter_sort.latest"}} {{.i18n.Tr "repo.issues.filter_sort.oldest"}} {{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}} {{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}
From 3faafea7222f8c0f8fb220be600ec294d7d46e14 Mon Sep 17 00:00:00 2001 From: Kazuki Sawada Date: Thu, 5 Oct 2017 02:23:37 +0900 Subject: [PATCH 5/7] Added missing sort order "newest" --- routers/home.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routers/home.go b/routers/home.go index 0427f318840b2..7a0e3423d5065 100644 --- a/routers/home.go +++ b/routers/home.go @@ -91,6 +91,8 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { ctx.Data["SortType"] = ctx.Query("sort") switch ctx.Query("sort") { + case "newest": + orderBy = models.SearchOrderByNewest case "oldest": orderBy = models.SearchOrderByOldest case "recentupdate": From eadf8ae02c674eb541f79b462ab5b707d03524bb Mon Sep 17 00:00:00 2001 From: Kazuki Sawada Date: Thu, 5 Oct 2017 03:33:47 +0900 Subject: [PATCH 6/7] Change default sort order --- routers/home.go | 8 ++++++-- routers/user/profile.go | 7 +------ templates/explore/search.tmpl | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/routers/home.go b/routers/home.go index 7a0e3423d5065..ec85682b00d92 100644 --- a/routers/home.go +++ b/routers/home.go @@ -88,8 +88,8 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { err error orderBy models.SearchOrderBy ) + ctx.Data["SortType"] = ctx.Query("sort") - switch ctx.Query("sort") { case "newest": orderBy = models.SearchOrderByNewest @@ -108,6 +108,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { case "size": orderBy = models.SearchOrderBySize default: + ctx.Data["SortType"] = "recentupdate" orderBy = models.SearchOrderByRecentUpdated } @@ -190,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": @@ -201,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 50d0c2397fbbb..b0eab09333712 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 67cd201e09565..dbf0b15e7aa4a 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -10,7 +10,7 @@ {{.i18n.Tr "repo.issues.filter_sort.oldest"}} {{.i18n.Tr "repo.issues.label.filter_sort.alphabetically"}} {{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} From cb29f12867297a6f69f4710945d855873c5bd644 Mon Sep 17 00:00:00 2001 From: Kazuki Sawada Date: Thu, 5 Oct 2017 03:49:13 +0900 Subject: [PATCH 7/7] fmt --- routers/home.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/home.go b/routers/home.go index ec85682b00d92..94c570b6ce057 100644 --- a/routers/home.go +++ b/routers/home.go @@ -88,7 +88,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { err error orderBy models.SearchOrderBy ) - + ctx.Data["SortType"] = ctx.Query("sort") switch ctx.Query("sort") { case "newest":