From 9c4ad3eacaa8d2252eed962210d017643aaae767 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Tue, 12 Jan 2021 16:07:46 +0200 Subject: [PATCH] Fixed evaluating default value in `hidden` field --- CHANGELOG.md | 6 ++++++ themes/grav/templates/forms/field.html.twig | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b194ac9f..ce6bd561 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.9.20 +## mm/dd/2021 + +1. [](#bugfix) + * Fixed evaluating default value in `hidden` field (thanks @NicoHood) + # v1.9.19 ## 12/14/2020 diff --git a/themes/grav/templates/forms/field.html.twig b/themes/grav/templates/forms/field.html.twig index 8fce94f5..b68404e1 100644 --- a/themes/grav/templates/forms/field.html.twig +++ b/themes/grav/templates/forms/field.html.twig @@ -4,9 +4,14 @@ {% set originalValue = originalValue is defined ? originalValue : value %} {% set toggleableChecked = field.toggleable and originalValue is not null %} {% set isDisabledToggleable = field.toggleable and not toggleableChecked %} - {% set value = value ?? field.default %} + {% set default = field.default %} + {% set value = value ?? null %} + {% set has_value = value is not same as(null) %} + {% if not has_value %} + {% set value = default %} + {% endif %} - {% if (field.yaml or field.validate.type == 'yaml') and value is iterable%} + {% if (field.yaml or field.validate.type == 'yaml') and value is iterable %} {% set value = value|toYaml %} {% endif %} {% endif %}