rearrange NotFound call

wxiaoguang · wxiaoguang · commit f6b68be74862 · 2024-02-27T01:33:20.000+08:00
diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go
@@ -86,6 +86,7 @@ func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions,
 	}
 
 	if opts.SupportedSortOrders != nil && !opts.SupportedSortOrders.Contains(sortOrder) {
+		ctx.NotFound("unsupported sort order", nil)
 		return
 	}
 
@@ -150,11 +151,6 @@ func Users(ctx *context.Context) {
 		ctx.SetFormString("sort", sortOrder)
 	}
 
-	if !supportedSortOrders.Contains(sortOrder) {
-		ctx.NotFound("unsupported sort order", nil)
-		return
-	}
-
 	RenderUserSearch(ctx, &user_model.SearchUserOptions{
 		Actor:       ctx.Doer,
 		Type:        user_model.UserTypeIndividual,

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ func RenderUserSearch(ctx context.Context, opts user_model.SearchUserOptions,`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`if opts.SupportedSortOrders != nil && !opts.SupportedSortOrders.Contains(sortOrder) {`
	`89`	`+ ctx.NotFound("unsupported sort order", nil)`
`89`	`90`	`return`
`90`	`91`	`}`
`91`	`92`
`@@ -150,11 +151,6 @@ func Users(ctx *context.Context) {`
`150`	`151`	`ctx.SetFormString("sort", sortOrder)`
`151`	`152`	`}`
`152`	`153`
`153`		`- if !supportedSortOrders.Contains(sortOrder) {`
`154`		`- ctx.NotFound("unsupported sort order", nil)`
`155`		`- return`
`156`		`- }`
`157`		`-`
`158`	`154`	`RenderUserSearch(ctx, &user_model.SearchUserOptions{`
`159`	`155`	`Actor: ctx.Doer,`
`160`	`156`	`Type: user_model.UserTypeIndividual,`