Removed |safe from flat_attrs (#57)

smithdc1 · web-flow · commit 004f73dc84a8 · 2021-06-08T20:29:49.000+01:00
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/baseinput.html b/crispy_bootstrap5/templates/bootstrap5/layout/baseinput.html
@@ -5,5 +5,5 @@
         class="{{ input.field_classes }}"
         id="{% if input.id %}{{ input.id }}{% else %}{{ input.input_type }}-id-{{ input.name|slugify }}{% endif %}"
     {% endif %}
-    {{ input.flat_attrs|safe }}
+    {{ input.flat_attrs }}
     />
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/button.html b/crispy_bootstrap5/templates/bootstrap5/layout/button.html
@@ -1 +1 @@
-<button {{ button.flat_attrs|safe }}>{{ button.content|safe }}</button>
+<button {{ button.flat_attrs }}>{{ button.content|safe }}</button>
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/checkboxselectmultiple.html b/crispy_bootstrap5/templates/bootstrap5/layout/checkboxselectmultiple.html
@@ -1,7 +1,7 @@
 {% load crispy_forms_filters %}
 {% load l10n %}
 
-<div {% if field_class %}class="{{ field_class }}"{% endif %}{% if flat_attrs %} {{ flat_attrs|safe }}{% endif %}>
+<div {% if field_class %}class="{{ field_class }}"{% endif %}{% if flat_attrs %} {{ flat_attrs }}{% endif %}>
 
     {% for choice in field.field.choices %}
     <div class="form-check{% if inline_class %} form-check-inline{% endif %}">
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/column.html b/crispy_bootstrap5/templates/bootstrap5/layout/column.html
@@ -1,5 +1,5 @@
 <div {% if div.css_id %}id="{{ div.css_id }}"{% endif %}
-     class="{% if 'col' in div.css_class %}{{ div.css_class|default:'' }}{% else %}col-md {{ div.css_class|default:'' }}{% endif %}" {{ div.flat_attrs|safe }}>
+     class="{% if 'col' in div.css_class %}{{ div.css_class|default:'' }}{% else %}col-md {{ div.css_class|default:'' }}{% endif %}" {{ div.flat_attrs }}>
         {{ fields|safe }}
 </div>
 
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/div.html b/crispy_bootstrap5/templates/bootstrap5/layout/div.html
@@ -1,4 +1,4 @@
 <div {% if div.css_id %}id="{{ div.css_id }}"{% endif %} 
-    {% if div.css_class %}class="{{ div.css_class }}"{% endif %} {{ div.flat_attrs|safe }}>
+    {% if div.css_class %}class="{{ div.css_class }}"{% endif %} {{ div.flat_attrs }}>
         {{ fields|safe }}
 </div>
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/field_with_buttons.html b/crispy_bootstrap5/templates/bootstrap5/layout/field_with_buttons.html
@@ -1,6 +1,6 @@
 {% load crispy_forms_field %}
 
-<div{% if div.css_id %} id="{{ div.css_id }}"{% endif %} class="mb-3{% if 'form-horizontal' in form_class %} row{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}{% if div.css_class %} {{ div.css_class }}{% endif %}" {{ div.flat_attrs|safe }}>
+<div{% if div.css_id %} id="{{ div.css_id }}"{% endif %} class="mb-3{% if 'form-horizontal' in form_class %} row{% endif %}{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}{% if div.css_class %} {{ div.css_class }}{% endif %}" {{ div.flat_attrs }}>
     {% if field.label and form_show_labels %}
         <label for="{{ field.id_for_label }}" class="{% if 'form-horizontal' in form_class %}col-form-label {% else %}form-label {% endif %}{{ label_class }}{% if field.field.required %} requiredField{% endif %}">
             {{ field.label }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/fieldset.html b/crispy_bootstrap5/templates/bootstrap5/layout/fieldset.html
@@ -1,6 +1,6 @@
 <fieldset {% if fieldset.css_id %}id="{{ fieldset.css_id }}"{% endif %} 
     {% if fieldset.css_class or form_style %}class="{{ fieldset.css_class }} {{ form_style }}"{% endif %}
-    {{ fieldset.flat_attrs|safe }}>
+    {{ fieldset.flat_attrs }}>
     {% if legend %}<legend>{{ legend|safe }}</legend>{% endif %}
     {{ fields|safe }} 
 </fieldset>
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/formactions.html b/crispy_bootstrap5/templates/bootstrap5/layout/formactions.html
@@ -1,4 +1,4 @@
-<div{% if formactions.attrs %} {{ formactions.flat_attrs|safe }}{% endif %} class="mb-3">
+<div{% if formactions.attrs %} {{ formactions.flat_attrs }}{% endif %} class="mb-3">
     {% if label_class %}
         <div class="aab {{ label_class }}"></div>
     {% endif %}
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/radioselect.html b/crispy_bootstrap5/templates/bootstrap5/layout/radioselect.html
@@ -1,7 +1,7 @@
 {% load crispy_forms_filters %}
 {% load l10n %}
 
-<div class="{% if field_class %} {{ field_class }}{% endif %}"{% if flat_attrs %} {{ flat_attrs|safe }}{% endif %}>
+<div class="{% if field_class %} {{ field_class }}{% endif %}"{% if flat_attrs %} {{ flat_attrs }}{% endif %}>
 
     {% for choice in field.field.choices %}
       <div class="form-check{% if inline_class %} form-check-inline{% endif %}">
diff --git a/crispy_bootstrap5/templates/bootstrap5/layout/row.html b/crispy_bootstrap5/templates/bootstrap5/layout/row.html
@@ -1,3 +1,3 @@
-<div {% if div.css_id %}id="{{ div.css_id }}"{% endif %} class="row {{ div.css_class|default:'' }}" {{ div.flat_attrs|safe }}>
+<div {% if div.css_id %}id="{{ div.css_id }}"{% endif %} class="row {{ div.css_class|default:'' }}" {{ div.flat_attrs }}>
   {{ fields|safe }}
 </div>
diff --git a/crispy_bootstrap5/templates/bootstrap5/table_inline_formset.html b/crispy_bootstrap5/templates/bootstrap5/table_inline_formset.html
@@ -4,7 +4,7 @@
 
 {% specialspaceless %}
 {% if formset_tag %}
-<form {{ flat_attrs|safe }} method="{{ form_method }}" {% if formset.is_multipart %} enctype="multipart/form-data"{% endif %}>
+<form {{ flat_attrs }} method="{{ form_method }}" {% if formset.is_multipart %} enctype="multipart/form-data"{% endif %}>
 {% endif %}
     {% if formset_method|lower == 'post' and not disable_csrf %}
         {% csrf_token %}
diff --git a/crispy_bootstrap5/templates/bootstrap5/whole_uni_form.html b/crispy_bootstrap5/templates/bootstrap5/whole_uni_form.html
@@ -1,7 +1,7 @@
 {% load crispy_forms_utils %}
 
 {% specialspaceless %}
-{% if form_tag %}<form {{ flat_attrs|safe }} method="{{ form_method }}" {% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>{% endif %}
+{% if form_tag %}<form {{ flat_attrs }} method="{{ form_method }}" {% if form.is_multipart %} enctype="multipart/form-data"{% endif %}>{% endif %}
     {% if form_method|lower == 'post' and not disable_csrf %}
         {% csrf_token %}
     {% endif %}
diff --git a/crispy_bootstrap5/templates/bootstrap5/whole_uni_formset.html b/crispy_bootstrap5/templates/bootstrap5/whole_uni_formset.html
@@ -3,7 +3,7 @@
 
 {% specialspaceless %}
 {% if formset_tag %}
-<form {{ flat_attrs|safe }} method="{{ form_method }}" {% if formset.is_multipart %} enctype="multipart/form-data"{% endif %}>
+<form {{ flat_attrs }} method="{{ form_method }}" {% if formset.is_multipart %} enctype="multipart/form-data"{% endif %}>
 {% endif %}
     {% if formset_method|lower == 'post' and not disable_csrf %}
         {% csrf_token %}
diff --git a/tests/results/flat_attrs.html b/tests/results/flat_attrs.html
@@ -0,0 +1 @@
+<div aria-labelledby="test<>%" class=" row">
diff --git a/tests/test_layout.py b/tests/test_layout.py
@@ -628,3 +628,15 @@ def test_tabular_formset_layout():
     assert parse_form(formset) == parse_expected(
         "test_tabular_formset_layout_failing.html"
     )
+
+
+def test_flat_attrs_safe():
+    form = SampleForm()
+    form.helper = FormHelper()
+    form.helper.layout = Layout(
+        Row(
+            aria_labelledby="test<>%",
+        )
+    )
+    form.helper.form_tag = False
+    assert parse_form(form) == parse_expected("flat_attrs.html")

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<button {{ button.flat_attrs\|safe }}>{{ button.content\|safe }}</button>`
	`1`	`+<button {{ button.flat_attrs }}>{{ button.content\|safe }}</button>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div{% if formactions.attrs %} {{ formactions.flat_attrs\|safe }}{% endif %} class="mb-3">`
	`1`	`+<div{% if formactions.attrs %} {{ formactions.flat_attrs }}{% endif %} class="mb-3">`
`2`	`2`	`{% if label_class %}`
`3`	`3`	`<div class="aab {{ label_class }}"></div>`
`4`	`4`	`{% endif %}`