Fix over-escaped values in templates; fixes #1673

[galette.git] / galette / templates / default / elements / display_dynamic_fields.html.twig

diff --git a/galette/templates/default/elements/display_dynamic_fields.html.twig b/galette/templates/default/elements/display_dynamic_fields.html.twig
index e86cc48325b9f84a80c565175459bd36a8d92cd5..37583d2401847fbe2fe429ccb77087c231989c5a 100644 (file)
--- a/galette/templates/default/elements/display_dynamic_fields.html.twig
+++ b/galette/templates/default/elements/display_dynamic_fields.html.twig
@@ -17,13 +17,15 @@
                     <th class="three wide column">{{ field.getName()|escape }}</th>
                     <td>
                         {% for field_data in object.getDynamicFields().getValues(field.getId()) %}
-                            {% set value = field_data.field_val %}
+                            {% set value = field_data.field_val|escape|default("") %}
                             {% if get_class(field) == 'Galette\\DynamicFields\\Choice' %}
                                 {% if field_data.text_val is defined %}
                                     {% set value = field_data.text_val %}
                                 {% else %}
                                     {% set value = "" %}
                                 {% endif %}
+                            {% elseif get_class(field) == 'Galette\\DynamicFields\\Text' %}
+                                {% set value = field_data.field_val|escape|nl2br|default("") %}
                             {% endif %}
                             {% if not loop.first %}<br />{% endif %}
                             {% if get_class(field) == 'Galette\\DynamicFields\\Boolean' %}
@@ -33,13 +35,13 @@
                         {{ _T("No") }}
                                 {% endif %}
                             {% elseif get_class(field) == 'Galette\\DynamicFields\\File' %}
-                        <a href="{{ url_for("getDynamicFile", {"id": object.id, "fid": field.getId(), "pos": loop.index, "name": value}) }}">{{ value }}</a>
+                                <a href="{{ url_for("getDynamicFile", {"id": object.id, "fid": field.getId(), "pos": loop.index, "name": value}) }}">{{ value }}</a>
                             {% elseif get_class(field) == 'Galette\\DynamicFields\\Line' and callstatic("Galette\\Core\\GaletteMail", "isValidEmail", value) %}
                                 <a href="mailto:{{ value }}">{{ value }}</a>
                             {% elseif get_class(field) == 'Galette\\DynamicFields\\Line' and callstatic("Galette\\Core\\GaletteMail", "isUrl", value) %}
                                 <a href="{{ value }}" target="_blank" title="{{ _T("Open '%s' in a new window")|replace({"%s": value}) }}">{{ value }}</a>
                             {% else %}
-                        {{ value|nl2br|default("") }}
+                                {{ value|raw }}
                             {% endif %}
                         {% endfor %}
                     </td>