camzalewski/personal-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Support datetime-local form element.

Browse source
This commit is contained in:
mikestefanello 2025-04-19 15:49:44 -04:00
parent 13ae07ae60
commit cb5c3ad127
3 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ent/admin/handler.go
View file

@ -15,6 +15,8 @@ import (
"github.com/mikestefanello/pagoda/ent/user"
)
const dateTimeFormat = "2006-01-02T15:04:05"
type Handler struct {
client *ent.Client
Config HandlerConfig
@ -175,7 +177,7 @@ func (h *Handler) PasswordTokenGet(ctx echo.Context, id int) (url.Values, error)
v := url.Values{}
v.Set("user_id", fmt.Sprint(entity.UserID))
v.Set("created_at", entity.CreatedAt.Format(time.RFC3339))
v.Set("created_at", entity.CreatedAt.Format(dateTimeFormat))
return v, err
}
@ -289,11 +291,19 @@ func (h *Handler) getPageAndOffset(ctx echo.Context) (int, int) {
}
func (h *Handler) bind(ctx echo.Context, entity any) error {
// Remove empty field values so Echo's bind does not fail when trying to parse things like
// times, etc.
// Echo requires some pre-processing of form values to avoid problems.
for k, v := range ctx.Request().Form {
// Remove empty field values so Echo's bind does not fail when trying to parse things like
// times, etc.
if len(v) == 1 && len(v[0]) == 0 {
delete(ctx.Request().Form, k)
continue
}
// Echo expects datetime values to be in a certain format but that does not align with the datetime-local
// HTML form element format, so we will attempt to convert it here.
if t, err := time.Parse(dateTimeFormat, v[0]); err == nil {
ctx.Request().Form[k][0] = t.Format(time.RFC3339)
}
}
return ctx.Bind(entity)

16
ent/admin/templates/handler.tmpl
View file

@ -20,6 +20,8 @@
{{- end }}
)
const dateTimeFormat = "2006-01-02T15:04:05"
type Handler struct {
client *{{ $pkg }}.Client
Config HandlerConfig
@ -215,7 +217,7 @@
{{- if eq $f.Type.String "string" }}
v.Set("{{ $f.Name }}", entity.{{ fieldName $f.Name }})
{{- else if eq $f.Type.String "time.Time" }}
v.Set("{{ $f.Name }}", entity.{{ fieldName $f.Name }}.Format(time.RFC3339))
v.Set("{{ $f.Name }}", entity.{{ fieldName $f.Name }}.Format(dateTimeFormat))
{{- else }}
v.Set("{{ $f.Name }}", fmt.Sprint(entity.{{ fieldName $f.Name }}))
{{- end }}
@ -235,12 +237,20 @@
}
func (h *Handler) bind(ctx echo.Context, entity any) error {
// Remove empty field values so Echo's bind does not fail when trying to parse things like
// times, etc.
// Echo requires some pre-processing of form values to avoid problems.
for k, v := range ctx.Request().Form {
// Remove empty field values so Echo's bind does not fail when trying to parse things like
// times, etc.
if len(v) == 1 && len(v[0]) == 0 {
delete(ctx.Request().Form, k)
continue
}
// Echo expects datetime values to be in a certain format but that does not align with the datetime-local
// HTML form element format, so we will attempt to convert it here.
if t, err := time.Parse(dateTimeFormat, v[0]); err == nil {
ctx.Request().Form[k][0] = t.Format(time.RFC3339)
}
}
return ctx.Bind(entity)
}