diff options
| author | 6543 <6543@obermui.de> | 2024-02-29 19:52:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-29 18:52:49 +0000 |
| commit | f6656181e4a07d6c415927220efa2077d509f7c6 (patch) | |
| tree | 27d195c32a09091ea73dcd22b71f6dd5512162fc /routers/web/admin | |
| parent | c7dcb58b1d96970959a5c8ac8d3955e4b7d027df (diff) | |
| download | gitea-f6656181e4a07d6c415927220efa2077d509f7c6.tar.gz gitea-f6656181e4a07d6c415927220efa2077d509f7c6.zip | |
migrate some more "OptionalBool" to "Option[bool]" (#29479)
just some refactoring bits towards replacing **util.OptionalBool** with
**optional.Option[bool]**
---------
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Diffstat (limited to 'routers/web/admin')
| -rw-r--r-- | routers/web/admin/emails.go | 6 | ||||
| -rw-r--r-- | routers/web/admin/users.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/routers/web/admin/emails.go b/routers/web/admin/emails.go index 4296d70aee..2cf4035c6a 100644 --- a/routers/web/admin/emails.go +++ b/routers/web/admin/emails.go @@ -12,8 +12,8 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/context" ) @@ -68,10 +68,10 @@ func Emails(ctx *context.Context) { opts.Keyword = ctx.FormTrim("q") opts.SortType = orderBy if len(ctx.FormString("is_activated")) != 0 { - opts.IsActivated = util.OptionalBoolOf(ctx.FormBool("activated")) + opts.IsActivated = optional.Some(ctx.FormBool("activated")) } if len(ctx.FormString("is_primary")) != 0 { - opts.IsPrimary = util.OptionalBoolOf(ctx.FormBool("primary")) + opts.IsPrimary = optional.Some(ctx.FormBool("primary")) } if len(opts.Keyword) == 0 || isKeywordValid(opts.Keyword) { diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index cbca26eba8..bbdbc820d7 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -276,7 +276,7 @@ func ViewUser(ctx *context.Context) { OwnerID: u.ID, OrderBy: db.SearchOrderByAlphabetically, Private: true, - Collaborate: util.OptionalBoolFalse, + Collaborate: optional.Some(false), }) if err != nil { ctx.ServerError("SearchRepository", err) |