mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Refactor admin user filter query parameters (#18965)
Only pass `status_filter` on admin page Use a more general method to pass query parameters, remove hard-coded keys
This commit is contained in:
		@@ -41,10 +41,16 @@ func Users(ctx *context.Context) {
 | 
			
		||||
	ctx.Data["PageIsAdmin"] = true
 | 
			
		||||
	ctx.Data["PageIsAdminUsers"] = true
 | 
			
		||||
 | 
			
		||||
	extraParamStrings := map[string]string{}
 | 
			
		||||
	statusFilterKeys := []string{"is_active", "is_admin", "is_restricted", "is_2fa_enabled", "is_prohibit_login"}
 | 
			
		||||
	statusFilterMap := map[string]string{}
 | 
			
		||||
	for _, filterKey := range statusFilterKeys {
 | 
			
		||||
		statusFilterMap[filterKey] = ctx.FormString("status_filter[" + filterKey + "]")
 | 
			
		||||
		paramKey := "status_filter[" + filterKey + "]"
 | 
			
		||||
		paramVal := ctx.FormString(paramKey)
 | 
			
		||||
		statusFilterMap[filterKey] = paramVal
 | 
			
		||||
		if paramVal != "" {
 | 
			
		||||
			extraParamStrings[paramKey] = paramVal
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	sortType := ctx.FormString("sort")
 | 
			
		||||
@@ -68,6 +74,7 @@ func Users(ctx *context.Context) {
 | 
			
		||||
		IsRestricted:       util.OptionalBoolParse(statusFilterMap["is_restricted"]),
 | 
			
		||||
		IsTwoFactorEnabled: util.OptionalBoolParse(statusFilterMap["is_2fa_enabled"]),
 | 
			
		||||
		IsProhibitLogin:    util.OptionalBoolParse(statusFilterMap["is_prohibit_login"]),
 | 
			
		||||
		ExtraParamStrings:  extraParamStrings,
 | 
			
		||||
	}, tplUsers)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user