Skip to content

Commit

Permalink
bug #25305 [Form][TwigBridge] Fix collision between view properties a…
Browse files Browse the repository at this point in the history
…nd form fields (yceruto)

This PR was merged into the 3.3 branch.

Discussion
----------

[Form][TwigBridge] Fix collision between view properties and form fields

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Require #25236 merged in 3.3

Commits
-------

888b48a Fix collision between view properties and form fields
  • Loading branch information
fabpot committed Dec 4, 2017
2 parents 561767c + 888b48a commit e4ce312
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

0 comments on commit e4ce312

Please sign in to comment.