From e05f3403d8ea4952215f082c73c6d0a596fc3987 Mon Sep 17 00:00:00 2001
From: Norwin Roosen <git@nroo.de>
Date: Wed, 10 Mar 2021 19:10:40 +0100
Subject: [PATCH 1/2] fix admin user sorting

---
 models/repo_list.go              | 12 ++++++++----
 routers/home.go                  |  4 ++++
 templates/admin/base/search.tmpl |  2 ++
 templates/admin/user/list.tmpl   |  4 ++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/models/repo_list.go b/models/repo_list.go
index de3562a2abb6e..7c5c3abd32207 100644
--- a/models/repo_list.go
+++ b/models/repo_list.go
@@ -199,10 +199,14 @@ const (
 	SearchOrderBySizeReverse           SearchOrderBy = "size DESC"
 	SearchOrderByID                    SearchOrderBy = "id ASC"
 	SearchOrderByIDReverse             SearchOrderBy = "id DESC"
-	SearchOrderByStars                 SearchOrderBy = "num_stars ASC"
-	SearchOrderByStarsReverse          SearchOrderBy = "num_stars DESC"
-	SearchOrderByForks                 SearchOrderBy = "num_forks ASC"
-	SearchOrderByForksReverse          SearchOrderBy = "num_forks DESC"
+	// repo
+	SearchOrderByStars        SearchOrderBy = "num_stars ASC"
+	SearchOrderByStarsReverse SearchOrderBy = "num_stars DESC"
+	SearchOrderByForks        SearchOrderBy = "num_forks ASC"
+	SearchOrderByForksReverse SearchOrderBy = "num_forks DESC"
+	// user
+	SearchOrderByRecentLogin        SearchOrderBy = "last_login_unix ASC"
+	SearchOrderByRecentLoginReverse SearchOrderBy = "last_login_unix DESC"
 )
 
 // SearchRepositoryCondition creates a query condition according search repository options
diff --git a/routers/home.go b/routers/home.go
index 6505a4180df03..9668521d097ec 100644
--- a/routers/home.go
+++ b/routers/home.go
@@ -213,6 +213,10 @@ func RenderUserSearch(ctx *context.Context, opts *models.SearchUserOptions, tplN
 		orderBy = models.SearchOrderByRecentUpdated
 	case "leastupdate":
 		orderBy = models.SearchOrderByLeastUpdated
+	case "recentlogin":
+		orderBy = models.SearchOrderByRecentLogin
+	case "recentloginreverse":
+		orderBy = models.SearchOrderByRecentLoginReverse
 	case "reversealphabetically":
 		orderBy = models.SearchOrderByAlphabeticallyReverse
 	case "alphabetically":
diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl
index 8a7af53da5bfd..7cce9a150336a 100644
--- a/templates/admin/base/search.tmpl
+++ b/templates/admin/base/search.tmpl
@@ -12,6 +12,8 @@
 			<a class="{{if eq .SortType "reversealphabetically"}}active{{end}} item" href="{{$.Link}}?sort=reversealphabetically&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
 			<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a>
 			<a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?sort=leastupdate&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a>
+			<a class="{{if eq .SortType "recentlogin"}}active{{end}} item" href="{{$.Link}}?sort=recentlogin&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.recentlogin"}}</a>
+			<a class="{{if eq .SortType "recentloginreverse"}}active{{end}} item" href="{{$.Link}}?sort=recentloginreverse&q={{$.Keyword}}">{{.i18n.Tr "repo.issues.filter_sort.recentloginreverse"}}</a>
 		</div>
 	</div>
 </div>
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 661d38cb03ba2..d0826c1b036b3 100644
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -28,9 +28,9 @@
 						<th>{{.i18n.Tr "admin.users.2fa"}}</th>
 						<th>{{.i18n.Tr "admin.users.repos"}}</th>
 						<th>{{.i18n.Tr "admin.users.created"}}</th>
-						<th data-sortt-asc="recentupdate" data-sortt-desc="leastupdate">
+						<th data-sortt-asc="recentlogin" data-sortt-desc="recentloginreverse">
 							{{.i18n.Tr "admin.users.last_login"}}
-							{{SortArrow "recentupdate" "leastupdate" $.SortType false}}
+							{{SortArrow "recentlogin" "recentloginreverse" $.SortType false}}
 						</th>
 						<th>{{.i18n.Tr "admin.users.edit"}}</th>
 					</tr>

From d0c71514ae6dd18042e2eafd45aa32172be74331 Mon Sep 17 00:00:00 2001
From: Norwin Roosen <git@nroo.de>
Date: Wed, 10 Mar 2021 19:43:57 +0100
Subject: [PATCH 2/2] fix for repo listing too

---
 templates/admin/org/list.tmpl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl
index e0c9ac39a741f..17c78aaa46a8d 100644
--- a/templates/admin/org/list.tmpl
+++ b/templates/admin/org/list.tmpl
@@ -24,10 +24,7 @@
 						<th>{{.i18n.Tr "admin.orgs.teams"}}</th>
 						<th>{{.i18n.Tr "admin.orgs.members"}}</th>
 						<th>{{.i18n.Tr "admin.users.repos"}}</th>
-						<th data-sortt-asc="recentupdate" data-sortt-desc="leastupdate">
-							{{.i18n.Tr "admin.users.created"}}
-							{{SortArrow "recentupdate" "leastupdate" $.SortType false}}
-						</th>
+						<th>{{.i18n.Tr "admin.users.created"}}</th>
 						<th>{{.i18n.Tr "admin.users.edit"}}</th>
 					</tr>
 				</thead>