Merge branch '3.3' into 3.4

* 3.3:
  Fix collision between view properties and form fields
This commit is contained in:
Fabien Potencier 2017-12-04 10:18:35 -08:00
commit 6e390511b1

View File

@ -318,11 +318,11 @@
{% block form_errors -%}
{% if errors|length > 0 -%}
{% if form.parent %}<small class="error">{% else %}<div data-alert class="alert-box alert">{% endif %}
{% if form is not rootform %}<small class="error">{% else %}<div data-alert class="alert-box alert">{% endif %}
{%- for error in errors -%}
{{ error.message }}
{% if not loop.last %}, {% endif %}
{%- endfor -%}
{% if form.parent %}</small>{% else %}</div>{% endif %}
{% if form is not rootform %}</small>{% else %}</div>{% endif %}
{%- endif %}
{%- endblock form_errors %}