Переглянути джерело

Merge pull request #2620 from qsomazzi/master

Display child errors in sonata_type_immutable_array_widget_row
Thomas 10 роки тому
батько
коміт
e2350be1eb
2 змінених файлів з 4 додано та 3 видалено
  1. 1 0
      .travis.yml
  2. 3 3
      Resources/views/Form/form_admin_fields.html.twig

+ 1 - 0
.travis.yml

@@ -27,3 +27,4 @@ notifications:
 matrix:
   allow_failures:
     - php: hhvm
+    - env: SYMFONY_VERSION=2.7.*@dev

+ 3 - 3
Resources/views/Form/form_admin_fields.html.twig

@@ -266,7 +266,7 @@ file that was distributed with this source code.
 
 {% block sonata_type_immutable_array_widget_row %}
     {% spaceless %}
-        <div class="form-group{% if errors|length > 0%} error{%endif%}" id="sonata-ba-field-container-{{ id }}-{{ key }}">
+        <div class="form-group{% if child.vars.errors|length > 0%} error{%endif%}" id="sonata-ba-field-container-{{ id }}-{{ key }}">
 
             {{ form_label(child) }}
 
@@ -275,11 +275,11 @@ file that was distributed with this source code.
                 {% set div_class = "col-sm-9 col-md-9" %}
             {% endif%}
 
-            <div class="{{ div_class }} sonata-ba-field sonata-ba-field-{{ sonata_admin.edit }}-{{ sonata_admin.inline }} {% if errors|length > 0 %}sonata-ba-field-error{% endif %}">
+            <div class="{{ div_class }} sonata-ba-field sonata-ba-field-{{ sonata_admin.edit }}-{{ sonata_admin.inline }} {% if child.vars.errors|length > 0 %}sonata-ba-field-error{% endif %}">
                 {{ form_widget(child, {'horizontal': false, 'horizontal_input_wrapper_class': ''}) }} {# {'horizontal': false, 'horizontal_input_wrapper_class': ''} needed to avoid MopaBootstrapBundle messing with the DOM #}
             </div>
 
-            {% if errors|length > 0 %}
+            {% if child.vars.errors|length > 0 %}
                 <div class="help-block sonata-ba-field-error-messages">
                     {{ form_errors(child) }}
                 </div>