diff options
| author | 6543 <6543@obermui.de> | 2024-03-02 16:42:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-02 16:42:31 +0100 |
| commit | a3f05d0d98408bb47333b19f505b21afcefa9e7c (patch) | |
| tree | e4a1f8c48b45668ccdcb84fabc7fa77b47990bfa /routers/web/shared | |
| parent | 3f081d4b54261c1b4ee4f1df40c610fdd9581ef2 (diff) | |
| download | gitea-a3f05d0d98408bb47333b19f505b21afcefa9e7c.tar.gz gitea-a3f05d0d98408bb47333b19f505b21afcefa9e7c.zip | |
remove util.OptionalBool and related functions (#29513)
and migrate affected code
_last refactoring bits to replace **util.OptionalBool** with
**optional.Option[bool]**_
Diffstat (limited to 'routers/web/shared')
| -rw-r--r-- | routers/web/shared/packages/packages.go | 4 | ||||
| -rw-r--r-- | routers/web/shared/user/header.go | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/routers/web/shared/packages/packages.go b/routers/web/shared/packages/packages.go index 1454396f04..57671ad8f1 100644 --- a/routers/web/shared/packages/packages.go +++ b/routers/web/shared/packages/packages.go @@ -13,7 +13,7 @@ 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/util" + "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/forms" @@ -157,7 +157,7 @@ func SetRulePreviewContext(ctx *context.Context, owner *user_model.User) { for _, p := range packages { pvs, _, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{ PackageID: p.ID, - IsInternal: util.OptionalBoolFalse, + IsInternal: optional.Some(false), Sort: packages_model.SortCreatedDesc, Paginator: db.NewAbsoluteListOptions(pcr.KeepCount, 200), }) diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 51b04e0613..3bc1adae99 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -18,7 +18,6 @@ import ( "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" ) @@ -131,7 +130,7 @@ func LoadHeaderCount(ctx *context.Context) error { } projectCount, err := db.Count[project_model.Project](ctx, project_model.SearchOptions{ OwnerID: ctx.ContextUser.ID, - IsClosed: util.OptionalBoolOf(false), + IsClosed: optional.Some(false), Type: projectType, }) if err != nil { |