Add missing css_class to accordion and accordion-group templates (#180)

* Add missing css_class to accordion template * Add missing css_class to accordion-group template Co-authored-by: kosyrkovd <[email protected]>
django-crispy-forms · Jul 22, 2024 · 9a3e43f · 9a3e43f
1 parent c83b224
commit 9a3e43f
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 2024.3 (TBC)
 * Added support for Django 5.1.
+* Fixed `accordion.html` and `accordion-group.html` templates to render `css_class` attribute.
+* Dropped support for django-crispy-forms 2.2 and earlier.
 
 ## 2024.2 (2024-02-24)
 

diff --git a/crispy_bootstrap5/templates/bootstrap5/accordion-group.html b/crispy_bootstrap5/templates/bootstrap5/accordion-group.html
@@ -1,4 +1,4 @@
-<div class="accordion-item">
+<div class="accordion-item{% if div.css_class %} {{div.css_class}}{% endif %}">
     <h2 class="accordion-header">
         <button class="accordion-button{% if not div.active %} collapsed{% endif %}" type="button" data-bs-toggle="collapse" data-bs-target="#{{ div.css_id }}" aria-expanded="true"
             aria-controls="{{ div.css_id }}">

diff --git a/crispy_bootstrap5/templates/bootstrap5/accordion.html b/crispy_bootstrap5/templates/bootstrap5/accordion.html
@@ -1,3 +1,3 @@
-<div class="accordion{% if accordion.flush %} accordion-flush{% endif %}" id="{{ accordion.css_id }}">
+<div class="accordion{% if accordion.flush %} accordion-flush{% endif %}{% if accordion.css_class %} {{accordion.css_class}}{% endif %}" id="{{ accordion.css_id }}">
     {{ content|safe }}
 </div>
diff --git a/pyproject.toml b/pyproject.toml
@@ -34,7 +34,7 @@ dynamic = [
 ]
 dependencies = [
   "django>=4.2",
-  "django-crispy-forms>=2",
+  "django-crispy-forms>=2.3",
 ]
 [project.optional-dependencies]
 test = [

diff --git a/tests/test_layout_objects.py b/tests/test_layout_objects.py
@@ -274,6 +274,43 @@ def test_accordion_and_accordiongroup(self):
         )
         assert parse_form(form) == parse_expected("accordion.html")
 
+    def test_accordion_css_class_is_applied(self):
+        classes = 'one two three'
+        test_form = SampleForm()
+        test_form.helper = FormHelper()
+        test_form.helper.form_tag = False
+        test_form.helper.layout = Layout(
+            Accordion(
+                AccordionGroup("one", "first_name"),
+                css_class=classes,
+                css_id='super-accordion'
+            )
+        )
+        html = render_crispy_form(test_form)
+
+        assert (
+                html.count('<div class="accordion %s" id="super-accordion"' % classes)
+                == 1
+        )
+
+    def test_accordion_group_css_class_is_applied(self):
+        classes = 'one two three'
+        test_form = SampleForm()
+        test_form.helper = FormHelper()
+        test_form.helper.form_tag = False
+        test_form.helper.layout = Layout(
+            Accordion(
+                AccordionGroup("one", "first_name"),
+                AccordionGroup("two", "password1", "password2", css_class=classes),
+            )
+        )
+        html = render_crispy_form(test_form)
+
+        assert (
+                html.count('<div class="accordion-item %s"' % classes)
+                == 1
+        )
+
     def test_accordion_active_false_not_rendered(self):
         test_form = SampleForm()
         test_form.helper = FormHelper()