improve the user search sort

Author: lunny

modules/context/form.go

@@ -65,3 +65,8 @@ func (ctx *Context) FormOptionalBool(key string) util.OptionalBool {
 	v = v || strings.EqualFold(s, "on")
 	return util.OptionalBoolOf(v)
 }
+
+func (ctx *Context) SetFormValue(key, value string) {
+	_ = ctx.Req.FormValue(key) // force parse form
+	ctx.Req.Form.Set(key, value)
+}

routers/web/admin/orgs.go

@@ -23,12 +23,16 @@ func Organizations(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("admin.organizations")
 	ctx.Data["PageIsAdminOrganizations"] = true
 
-	explore.RenderUserSearchWithSort(ctx, &user_model.SearchUserOptions{
+	if ctx.FormString("sort") == "" {
+		ctx.SetFormValue("sort", explore.UserSearchDefaultAdminSort)
+	}
+
+	explore.RenderUserSearch(ctx, &user_model.SearchUserOptions{
 		Actor: ctx.Doer,
 		Type:  user_model.UserTypeOrganization,
 		ListOptions: db.ListOptions{
 			PageSize: setting.UI.Admin.OrgPagingNum,
 		},
 		Visible: []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate},
-	}, tplOrgs, explore.UserSearchDefaultAdminSort)
+	}, tplOrgs)
 }

routers/web/admin/users.go

@@ -54,13 +54,14 @@ func Users(ctx *context.Context) {
 	sortType := ctx.FormString("sort")
 	if sortType == "" {
 		sortType = explore.UserSearchDefaultAdminSort
+		ctx.SetFormValue("sort", sortType)
 	}
 	ctx.PageData["adminUserListSearchForm"] = map[string]interface{}{
 		"StatusFilterMap": statusFilterMap,
 		"SortType":        sortType,
 	}
 
-	explore.RenderUserSearchWithSort(ctx, &user_model.SearchUserOptions{
+	explore.RenderUserSearch(ctx, &user_model.SearchUserOptions{
 		Actor: ctx.Doer,
 		Type:  user_model.UserTypeIndividual,
 		ListOptions: db.ListOptions{
@@ -73,7 +74,7 @@ func Users(ctx *context.Context) {
 		IsTwoFactorEnabled: util.OptionalBoolParse(statusFilterMap["is_2fa_enabled"]),
 		IsProhibitLogin:    util.OptionalBoolParse(statusFilterMap["is_prohibit_login"]),
 		ExtraParamStrings:  extraParamStrings,
-	}, tplUsers, explore.UserSearchDefaultAdminSort)
+	}, tplUsers)
 }
 
 // NewUser render adding a new user page

routers/web/explore/org.go

@@ -30,6 +30,10 @@ func Organizations(ctx *context.Context) {
 		visibleTypes = append(visibleTypes, structs.VisibleTypeLimited, structs.VisibleTypePrivate)
 	}
 
+	if ctx.FormString("sort") == "" {
+		ctx.SetFormValue("sort", UserSearchDefaultSortType)
+	}
+
 	RenderUserSearch(ctx, &user_model.SearchUserOptions{
 		Actor:       ctx.Doer,
 		Type:        user_model.UserTypeOrganization,

routers/web/explore/user.go

@@ -37,11 +37,6 @@ func isKeywordValid(keyword string) bool {
 
 // RenderUserSearch render user search page
 func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions, tplName base.TplName) {
-	RenderUserSearchWithSort(ctx, opts, tplName, UserSearchDefaultSortType)
-}
-
-// RenderUserSearchWithSort render user search page with specific default sort
-func RenderUserSearchWithSort(ctx *context.Context, opts *user_model.SearchUserOptions, tplName base.TplName, defaultSort string) {
 	// Sitemap index for sitemap paths
 	opts.Page = int(ctx.ParamsInt64("idx"))
 	isSitemap := ctx.Params("idx") != ""
@@ -65,12 +60,8 @@ func RenderUserSearchWithSort(ctx *context.Context, opts *user_model.SearchUserO
 
 	// we can not set orderBy to `models.SearchOrderByXxx`, because there may be a JOIN in the statement, different tables may have the same name columns
 
-	sortType := ctx.FormString("sort")
-	if sortType == "" {
-		sortType = defaultSort
-	}
-	ctx.Data["SortType"] = sortType
-	switch sortType {
+	ctx.Data["SortType"] = ctx.FormString("sort")
+	switch ctx.FormString("sort") {
 	case "newest":
 		orderBy = "`user`.id DESC"
 	case "oldest":
@@ -142,6 +133,10 @@ func Users(ctx *context.Context) {
 	ctx.Data["PageIsExploreUsers"] = true
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
 
+	if ctx.FormString("sort") == "" {
+		ctx.SetFormValue("sort", UserSearchDefaultSortType)
+	}
+
 	RenderUserSearch(ctx, &user_model.SearchUserOptions{
 		Actor:       ctx.Doer,
 		Type:        user_model.UserTypeIndividual,