fixed form_rest() for embedded forms (refs #1051, #1115)

symfony · May 27, 2011 · 923c234 · 923c234
1 parent 4de930b
commit 923c234
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php
@@ -1,4 +1,4 @@
-<?php foreach ($form->getChildren() as $child): ?>
+<?php foreach ($form as $child): ?>
     <?php if (!$child->isRendered()): ?>
         <?php echo $view['form']->row($child) ?>
     <?php endif; ?>

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
@@ -1,6 +1,6 @@
 <div<?php echo $view['form']->attributes() ?>>
     <?php echo $view['form']->errors($form); ?>
-    <?php foreach ($form->getChildren() as $child): ?>
+    <?php foreach ($form as $child): ?>
         <?php echo $view['form']->row($child); ?>
     <?php endforeach; ?>
     <?php echo $view['form']->rest($form) ?>

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php
@@ -1,5 +1,5 @@
 <?php echo $view['form']->errors($form) ?>
 
-<?php foreach ($form->getChildren() as $child): ?>
+<?php foreach ($form as $child): ?>
     <?php echo $view['form']->row($child); ?>
 <?php endforeach; ?>
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
@@ -1,7 +1,7 @@
 {% block field_rows %}
 {% spaceless %}
     {{ form_errors(form) }}
-    {% for child in form.children %}
+    {% for child in form %}
         {{ form_row(child) }}
     {% endfor %}
 {% endspaceless %}
@@ -27,7 +27,7 @@
 
 {% block field_rest %}
 {% spaceless %}
-    {% for child in form.children %}
+    {% for child in form %}
         {% if not child.rendered %}
             {{ form_row(child) }}
         {% endif %}