diff options
author | 6543 <6543@obermui.de> | 2021-08-11 02:31:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-11 02:31:13 +0200 |
commit | c4d70a032564f610b7215d3d3973943abbc7395f (patch) | |
tree | 2aa8fe44a1b4d0251a18ae671509d4f2439ed85d /routers/web/explore | |
parent | 2eeae4edb685b22e926d301465d771fe7a0b0c83 (diff) | |
download | gitea-c4d70a032564f610b7215d3d3973943abbc7395f.tar.gz gitea-c4d70a032564f610b7215d3d3973943abbc7395f.zip |
Rename ctx.Form() to ctx.FormString() and move code into own file (#16571)
Followup from #16562 prepare for #16567
* Rename ctx.Form() to ctx.FormString()
* Reimplement FormX func to need less code and cpu cycles
* Move code into own file
Diffstat (limited to 'routers/web/explore')
-rw-r--r-- | routers/web/explore/code.go | 6 | ||||
-rw-r--r-- | routers/web/explore/repo.go | 6 | ||||
-rw-r--r-- | routers/web/explore/user.go | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index 5dd8298b2d..55a4409145 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -33,14 +33,14 @@ func Code(ctx *context.Context) { ctx.Data["PageIsExplore"] = true ctx.Data["PageIsExploreCode"] = true - language := strings.TrimSpace(ctx.Form("l")) - keyword := strings.TrimSpace(ctx.Form("q")) + language := strings.TrimSpace(ctx.FormString("l")) + keyword := strings.TrimSpace(ctx.FormString("q")) page := ctx.FormInt("page") if page <= 0 { page = 1 } - queryType := strings.TrimSpace(ctx.Form("t")) + queryType := strings.TrimSpace(ctx.FormString("t")) isMatch := queryType == "match" var ( diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index faac639caa..83fb721a7d 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -42,8 +42,8 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { orderBy models.SearchOrderBy ) - ctx.Data["SortType"] = ctx.Form("sort") - switch ctx.Form("sort") { + ctx.Data["SortType"] = ctx.FormString("sort") + switch ctx.FormString("sort") { case "newest": orderBy = models.SearchOrderByNewest case "oldest": @@ -73,7 +73,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { orderBy = models.SearchOrderByRecentUpdated } - keyword := strings.Trim(ctx.Form("q"), " ") + keyword := strings.Trim(ctx.FormString("q"), " ") topicOnly := ctx.FormBool("topic") ctx.Data["TopicOnly"] = topicOnly diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go index 85c45c7eff..06dcdb3c6a 100644 --- a/routers/web/explore/user.go +++ b/routers/web/explore/user.go @@ -44,8 +44,8 @@ func RenderUserSearch(ctx *context.Context, opts *models.SearchUserOptions, tplN orderBy models.SearchOrderBy ) - ctx.Data["SortType"] = ctx.Form("sort") - switch ctx.Form("sort") { + ctx.Data["SortType"] = ctx.FormString("sort") + switch ctx.FormString("sort") { case "newest": orderBy = models.SearchOrderByIDReverse case "oldest": @@ -63,7 +63,7 @@ func RenderUserSearch(ctx *context.Context, opts *models.SearchUserOptions, tplN orderBy = models.SearchOrderByAlphabetically } - opts.Keyword = strings.Trim(ctx.Form("q"), " ") + opts.Keyword = strings.Trim(ctx.FormString("q"), " ") opts.OrderBy = orderBy if len(opts.Keyword) == 0 || isKeywordValid(opts.Keyword) { users, count, err = models.SearchUsers(opts) |