From 8d1013ea39ceb63d7a34f1a48899457ef834350e Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Tue, 14 Jan 2020 11:32:35 +0200 Subject: [PATCH 1/5] Allow checkbox field to have custom value --- CHANGELOG.md | 6 ++++++ templates/forms/fields/checkbox/checkbox.html.twig | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf97cbdb..d0eb1f97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v4.0.2 +## mm/dd/2020 + +1. [](#improved) + * Allow checkbox field to have custom value + # v4.0.1 ## 01/02/2020 diff --git a/templates/forms/fields/checkbox/checkbox.html.twig b/templates/forms/fields/checkbox/checkbox.html.twig index c458e979..83c44601 100644 --- a/templates/forms/fields/checkbox/checkbox.html.twig +++ b/templates/forms/fields/checkbox/checkbox.html.twig @@ -9,9 +9,9 @@ Date: Tue, 14 Jan 2020 11:33:11 +0200 Subject: [PATCH 2/5] Changelog update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0eb1f97..71e5595c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## mm/dd/2020 1. [](#improved) - * Allow checkbox field to have custom value + * Allow checkbox field to have custom value, default to 1 # v4.0.1 ## 01/02/2020 From 5d720df33c3c26d465e38220debd7ee98ccaec21 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 17 Jan 2020 15:25:22 +0200 Subject: [PATCH 3/5] Fixed `toggle` field not working with `toggleable: true` --- CHANGELOG.md | 4 +++- templates/forms/fields/toggle/toggle.html.twig | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71e5595c..194148d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,9 @@ 1. [](#improved) * Allow checkbox field to have custom value, default to 1 - +1. [](#bugfix) + * Fixed `toggle` field not working with `toggleable: true` + # v4.0.1 ## 01/02/2020 diff --git a/templates/forms/fields/toggle/toggle.html.twig b/templates/forms/fields/toggle/toggle.html.twig index 15ee90e0..63651e5e 100644 --- a/templates/forms/fields/toggle/toggle.html.twig +++ b/templates/forms/fields/toggle/toggle.html.twig @@ -7,9 +7,6 @@ {% import _self as macro %} -{% set value = value ?? field.default %} -{% set value = (value is same as(false) ? 0 : value) %} - {% set has_hidden = false %} {% for key, text in field.options %} {% if key is empty %} @@ -23,6 +20,7 @@ {% endblock %} {% block input %} + {% set value = (value is same as(false) ? 0 : value) %}
{% set maxLen = 0 %} From c51558116ebd00443386996e98aecef537bf868a Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 24 Jan 2020 21:02:16 +0200 Subject: [PATCH 4/5] Fixed fatal error when form type is disabled --- CHANGELOG.md | 1 + form.php | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 194148d9..4841d6f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Allow checkbox field to have custom value, default to 1 1. [](#bugfix) * Fixed `toggle` field not working with `toggleable: true` + * Fixed fatal error when form type is disabled # v4.0.1 ## 01/02/2020 diff --git a/form.php b/form.php index dbc324a4..940f9009 100644 --- a/form.php +++ b/form.php @@ -712,10 +712,14 @@ public function onFormValidationError(Event $event) * Add a form to the forms plugin * * @param string|null $page_route - * @param FormInterface $form + * @param FormInterface|null $form */ - public function addForm(?string $page_route, FormInterface $form) + public function addForm(?string $page_route, ?FormInterface $form) { + if (null === $form) { + return; + } + $name = $form->getName(); if (!isset($this->forms[$page_route][$name])) { From 9a472ff3a332d999b58a1e80bc2dae859bdcb1b7 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 3 Feb 2020 09:51:48 -0700 Subject: [PATCH 5/5] prepare for release --- CHANGELOG.md | 2 +- blueprints.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4841d6f6..323096ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v4.0.2 -## mm/dd/2020 +## 02/03/2020 1. [](#improved) * Allow checkbox field to have custom value, default to 1 diff --git a/blueprints.yaml b/blueprints.yaml index 76988b8e..adc287de 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Form -version: 4.0.1 +version: 4.0.2 testing: false description: Enables the forms handling icon: check-square