Bläddra i källkod

Updating widget_choice_options block according new ChoiceView class.

Michael Shtukin 13 år sedan
förälder
incheckning
ed5a5c06e6
1 ändrade filer med 6 tillägg och 6 borttagningar
  1. 6 6
      Resources/views/Form/silex_form_div_layout.html.twig

+ 6 - 6
Resources/views/Form/silex_form_div_layout.html.twig

@@ -26,15 +26,15 @@
 
 
 {% block widget_choice_options %}
 {% block widget_choice_options %}
 {% spaceless %}
 {% spaceless %}
-    {% for choice, label in options %}
-        {% if _form_is_choice_group(label) %}
-            <optgroup label="{{ choice|trans }}">
-                {% for nestedChoice, nestedLabel in label %}
-                    <option value="{{ nestedChoice }}"{% if _form_is_choice_selected(form, nestedChoice) %} selected="selected"{% endif %}>{{ nestedLabel|trans }}</option>
+    {% for index, choice in options %}
+        {% if _form_is_choice_group(choice) %}
+            <optgroup label="{{ choice.label|trans }}">
+                {% for nestedIndex, nestedChoice in choice %}
+                    <option value="{{ nestedChoice.value }}"{% if _form_is_choice_selected(form, nestedChoice) %} selected="selected"{% endif %}>{{ nestedChoice.label|trans }}</option>
                 {% endfor %}
                 {% endfor %}
             </optgroup>
             </optgroup>
         {% else %}
         {% else %}
-            <option value="{{ choice }}"{% if _form_is_choice_selected(form, choice) %} selected="selected"{% endif %}>{{ label|trans }}</option>
+            <option value="{{ choice.value }}"{% if _form_is_choice_selected(form, choice) %} selected="selected"{% endif %}>{{ choice.label|trans }}</option>
         {% endif %}
         {% endif %}
     {% endfor %}
     {% endfor %}
 {% endspaceless %}
 {% endspaceless %}