mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-23 03:24:01 +09:00
Shudhanshu SinghandGitHub
bc3e228e78
Backport https://github.com/go-gitea/gitea/pull/39869 `PATCH /repos/{owner}/{repo}/milestones/{id}` always overwrote the due date with `due_on`, so a request that only changed other fields, such as `{"state": "closed"}`, silently removed it. The due date is now kept when `due_on` is omitted, and `"due_on": null` or `"due_on": ""` remove it. Only the milestone fix is backported. The issue and pull request deadline changes of https://github.com/go-gitea/gitea/pull/39869 build on https://github.com/go-gitea/gitea/pull/38677, which isn't on v28.
58 lines
1.0 KiB
Go
58 lines
1.0 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package optional
|
|
|
|
import (
|
|
"reflect"
|
|
|
|
"gitea.dev/modules/json"
|
|
|
|
"go.yaml.in/yaml/v4"
|
|
)
|
|
|
|
func (o *Option[T]) assignUnmarshalledValue(v *T) {
|
|
if reflect.TypeFor[T]().Kind() == reflect.Pointer && v == nil {
|
|
var zero T
|
|
*o = Some[T](zero)
|
|
} else {
|
|
*o = FromPtr(v)
|
|
}
|
|
}
|
|
|
|
func (o *Option[T]) UnmarshalJSON(data []byte) error {
|
|
var v *T
|
|
if err := json.Unmarshal(data, &v); err != nil {
|
|
return err
|
|
}
|
|
o.assignUnmarshalledValue(v)
|
|
return nil
|
|
}
|
|
|
|
func (o Option[T]) MarshalJSON() ([]byte, error) {
|
|
if !o.Has() {
|
|
return []byte("null"), nil
|
|
}
|
|
|
|
return json.Marshal(o.Value())
|
|
}
|
|
|
|
func (o *Option[T]) UnmarshalYAML(value *yaml.Node) error {
|
|
var v *T
|
|
if err := value.Decode(&v); err != nil {
|
|
return err
|
|
}
|
|
o.assignUnmarshalledValue(v)
|
|
return nil
|
|
}
|
|
|
|
func (o Option[T]) MarshalYAML() (any, error) {
|
|
if !o.Has() {
|
|
return nil, nil //nolint:nilnil // return nil to indicate no value to marshal
|
|
}
|
|
|
|
value := new(yaml.Node)
|
|
err := value.Encode(o.Value())
|
|
return value, err
|
|
}
|