Theodor-Springmann-Stiftung/musenalm
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/musenalm.git synced 2026-02-04 10:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

+BUGFIX: restore values on validation error

Browse Source
This commit is contained in:
Simon Martens
2026-01-22 16:49:49 +01:00
parent 17ab271de3
commit 163d6cd992
3 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
controllers/ort_edit.go
View File

@@ -117,13 +117,18 @@ func (p *OrtEditPage) GET(engine *templating.Engine, app core.App) HandleFunc {
}
}
func (p *OrtEditPage) renderError(engine *templating.Engine, app core.App, e *core.RequestEvent, message string) error {
func (p *OrtEditPage) renderError(engine *templating.Engine, app core.App, e *core.RequestEvent, message string, formdata *ortEditForm) error {
id := e.Request.PathValue("id")
data := make(map[string]any)
result, err := NewOrtEditResult(app, id)
if err != nil {
return engine.Response404(e, err, data)
}
if formdata != nil && result != nil && result.Place != nil {
name := strings.TrimSpace(formdata.Name)
status := strings.TrimSpace(formdata.Status)
applyPlaceForm(result.Place, *formdata, name, status, nil)
}
data["result"] = result
data["error"] = message
@@ -165,11 +170,11 @@ func (p *OrtEditPage) POST(engine *templating.Engine, app core.App) HandleFunc {
formdata := ortEditForm{}
if err := e.BindBody(&formdata); err != nil {
return p.renderError(engine, app, e, "Formulardaten ungültig.")
return p.renderError(engine, app, e, "Formulardaten ungültig.", nil)
}
if err := req.CheckCSRF(formdata.CSRFToken); err != nil {
return p.renderError(engine, app, e, err.Error())
return p.renderError(engine, app, e, err.Error(), &formdata)
}
place, err := dbmodels.Places_ID(app, id)
@@ -180,21 +185,21 @@ func (p *OrtEditPage) POST(engine *templating.Engine, app core.App) HandleFunc {
if formdata.LastEdited != "" {
lastEdited, err := types.ParseDateTime(formdata.LastEdited)
if err != nil {
return p.renderError(engine, app, e, "Ungültiger Bearbeitungszeitstempel.")
return p.renderError(engine, app, e, "Ungültiger Bearbeitungszeitstempel.", &formdata)
}
if !place.Updated().Time().Equal(lastEdited.Time()) {
return p.renderError(engine, app, e, "Der Ort wurde inzwischen geändert. Bitte Seite neu laden.")
return p.renderError(engine, app, e, "Der Ort wurde inzwischen geändert. Bitte Seite neu laden.", &formdata)
}
}
name := strings.TrimSpace(formdata.Name)
if name == "" {
return p.renderError(engine, app, e, "Name ist erforderlich.")
return p.renderError(engine, app, e, "Name ist erforderlich.", &formdata)
}
status := strings.TrimSpace(formdata.Status)
if status == "" || !slices.Contains(dbmodels.EDITORSTATE_VALUES, status) {
return p.renderError(engine, app, e, "Ungültiger Status.")
return p.renderError(engine, app, e, "Ungültiger Status.", &formdata)
}
// Capture old name (entries depend on place name)
@@ -206,7 +211,7 @@ func (p *OrtEditPage) POST(engine *templating.Engine, app core.App) HandleFunc {
return tx.Save(place)
}); err != nil {
app.Logger().Error("Failed to save place", "place_id", place.Id, "error", err)
return p.renderError(engine, app, e, "Speichern fehlgeschlagen.")
return p.renderError(engine, app, e, "Speichern fehlgeschlagen.", &formdata)
}
// Check if name changed (entries store place name)