diff options
author | 6543 <6543@obermui.de> | 2024-02-28 06:39:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-28 13:39:12 +0800 |
commit | 274c0aea2e88db9bc41690c90e13e8aedf6193d4 (patch) | |
tree | aed6cf5f0c72cc2b04e5cb3b0d758fb5aa95d68e /routers/web | |
parent | db545b208b4bd3d1961c519da66ee2b4421afa5c (diff) | |
download | gitea-274c0aea2e88db9bc41690c90e13e8aedf6193d4.tar.gz gitea-274c0aea2e88db9bc41690c90e13e8aedf6193d4.zip |
Let ctx.FormOptionalBool() return optional.Option[bool] (#29461)
just some refactoring bits towards replacing **util.OptionalBool** with
**optional.Option[bool]**
Diffstat (limited to 'routers/web')
-rw-r--r-- | routers/web/repo/release.go | 3 | ||||
-rw-r--r-- | routers/web/user/search.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index f9ab956d4c..a730c2d3b7 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -21,6 +21,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" + "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" @@ -223,7 +224,7 @@ func TagsList(ctx *context.Context) { // the drafts should also be included because a real tag might be used as a draft. IncludeDrafts: true, IncludeTags: true, - HasSha1: util.OptionalBoolTrue, + HasSha1: optional.Some(true), RepoID: ctx.Repo.Repository.ID, } diff --git a/routers/web/user/search.go b/routers/web/user/search.go index fb7729bbe1..5ef61c88d4 100644 --- a/routers/web/user/search.go +++ b/routers/web/user/search.go @@ -8,6 +8,7 @@ import ( "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/convert" ) @@ -24,7 +25,7 @@ func Search(ctx *context.Context) { Keyword: ctx.FormTrim("q"), UID: ctx.FormInt64("uid"), Type: user_model.UserTypeIndividual, - IsActive: ctx.FormOptionalBool("active"), + IsActive: util.OptionalBoolFromGeneric(ctx.FormOptionalBool("active")), ListOptions: listOptions, }) if err != nil { |