Merge pull request #3410 from acrobat/fix-form-pp-submitted-attr

[FormBundle] Fix form pagepart view variable with symfony template attribute
Kunstmaan · Apr 20, 2024 · 78b67cb · 78b67cb
2 parents b27a4b1 + 4196cc1
commit 78b67cb
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 6 deletions.
diff --git a/UPGRADE-7.2.md b/UPGRADE-7.2.md
@@ -0,0 +1,7 @@
+UPGRADE FROM 7.1 to 7.2
+========================
+
+FormBundle
+-----------
+
+- The frontendformobject view variable of form pagepart templates is deprecated and will be removed in 8.0. There is no replacement for this variable.
diff --git a/src/Kunstmaan/FormBundle/Helper/FormHandler.php b/src/Kunstmaan/FormBundle/Helper/FormHandler.php
@@ -82,7 +82,9 @@ public function handleForm(FormPageInterface $page, Request $request, RenderCont
             }
         }
         $context['frontendform'] = $form->createView();
+        /* @deprecated frontendformobject view variable is deprecated in 7.2 and will be removed in 8.0. There is no replacement for this variable. */
         $context['frontendformobject'] = $form;
+        $context['isSubmitted'] = $form->isSubmitted();
 
         return null;
     }

diff --git a/src/Kunstmaan/FormBundle/Resources/views/CheckboxPagePart/view.html.twig b/src/Kunstmaan/FormBundle/Resources/views/CheckboxPagePart/view.html.twig
@@ -1,3 +1,3 @@
 {% if frontendform is defined %}
-    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : frontendformobject.submitted } }) }}
+    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : isSubmitted } }) }}
 {% endif %}
diff --git a/src/Kunstmaan/FormBundle/Resources/views/ChoicePagePart/view.html.twig b/src/Kunstmaan/FormBundle/Resources/views/ChoicePagePart/view.html.twig
@@ -1,4 +1,4 @@
 {% if frontendform is defined %}
-    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : frontendformobject.submitted } }) }}
+    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : isSubmitted } }) }}
     {{ form_errors(frontendform['formwidget_'~resource.uniqueId]) }}
 {% endif %}
diff --git a/src/Kunstmaan/FormBundle/Resources/views/EmailPagePart/view.html.twig b/src/Kunstmaan/FormBundle/Resources/views/EmailPagePart/view.html.twig
@@ -1,3 +1,3 @@
 {% if frontendform is defined %}
-    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : frontendformobject.submitted } }) }}
+    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : isSubmitted } }) }}
 {% endif %}
diff --git a/src/Kunstmaan/FormBundle/Resources/views/FileUploadPagePart/view.html.twig b/src/Kunstmaan/FormBundle/Resources/views/FileUploadPagePart/view.html.twig
@@ -1,3 +1,3 @@
 {% if frontendform is defined %}
-    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : frontendformobject.submitted } }) }}
+    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : isSubmitted } }) }}
 {% endif %}
diff --git a/src/Kunstmaan/FormBundle/Resources/views/MultiLineTextPagePart/view.html.twig b/src/Kunstmaan/FormBundle/Resources/views/MultiLineTextPagePart/view.html.twig
@@ -1,3 +1,3 @@
 {% if frontendform is defined %}
-    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : frontendformobject.submitted } }) }}
+    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : isSubmitted } }) }}
 {% endif %}
diff --git a/src/Kunstmaan/FormBundle/Resources/views/SingleLineTextPagePart/view.html.twig b/src/Kunstmaan/FormBundle/Resources/views/SingleLineTextPagePart/view.html.twig
@@ -1,3 +1,3 @@
 {% if frontendform is defined %}
-    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : frontendformobject.submitted } }) }}
+    {{ form_widget(frontendform['formwidget_'~resource.uniqueId], { 'attr' : {'bound' : isSubmitted } }) }}
 {% endif %}