Fix "disabled" parameter for RadioSelect and CheckboxSelectMultiple (#…

…164) * Fix "disabled" parameter for RadioSelect and CheckboxSelectMultiple * Add test, remove debug print statement * Remove obsolete code * Update CHANGELOG and prepare release Co-authored-by: Sven Hertle <hertle@narfi.net>
zostera · Aug 16, 2021 · 9e07cde · 9e07cde
1 parent 5e405ef
commit 9e07cde
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [2.1.2] - 2021-08-16
+
+- Fix disabled parameter for RadioSelect and CheckboxSelectMultiple (#163).
+
 ## [2.1.1] - 2021-07-11
 
 - Respect safe strings in bootstrap_messages (#145).

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 setup(
     name="django-bootstrap5",
     zip_safe=False,
-    version="2.1.1",
+    version="2.1.2",
     description="Bootstrap 5 for Django",
     long_description=README,
     long_description_content_type="text/markdown",

diff --git a/src/django_bootstrap5/templates/django_bootstrap5/widgets/radio_select.html b/src/django_bootstrap5/templates/django_bootstrap5/widgets/radio_select.html
@@ -11,7 +11,8 @@
                        name="{{ option.name }}"
                        id="{{ option.attrs.id }}"
                         {% if option.value != None %} value="{{ option.value|stringformat:'s' }}"
-                            {% if option.attrs.checked %} checked="checked"{% endif %}{% endif %}>
+                            {% if option.attrs.checked %} checked="checked"{% endif %}{% endif %}
+                        {% if widget.attrs.disabled %} disabled{% endif %}>
                 <label class="form-check-label" for="{{ option.attrs.id }}">{{ option.label }}</label>
             </div>
         {% endfor %}

diff --git a/tests/test_bootstrap_field_radio_select.py b/tests/test_bootstrap_field_radio_select.py
@@ -13,6 +13,17 @@ class SelectTestForm(forms.Form):
     )
 
 
+class DisabledSelectTestForm(forms.Form):
+    test = forms.ChoiceField(
+        choices=(
+            (1, "one"),
+            (2, "two"),
+        ),
+        widget=forms.RadioSelect,
+        disabled=True,
+    )
+
+
 class BootstrapFieldSelectTestCase(BootstrapTestCase):
     def test_select(self):
         """Test field with select widget."""
@@ -78,3 +89,25 @@ def test_select_floating(self):
                 "</div>"
             ),
         )
+
+    def test_disabled_select(self):
+        """Test field with disabled select widget."""
+        self.maxDiff = None
+        self.assertHTMLEqual(
+            self.render("{% bootstrap_field form.test %}", context={"form": DisabledSelectTestForm()}),
+            (
+                '<div class="django_bootstrap5-req mb-3">'
+                '<label class="form-label" for="id_test_0">Test</label>'
+                '<div class="" disabled required id="id_test">'
+                '<div class="form-check">'
+                '<input class="form-check-input" disabled type="radio" name="test" id="id_test_0" value="1">'
+                '<label class="form-check-label" for="id_test_0">one</label>'
+                "</div>"
+                '<div class="form-check">'
+                '<input class="form-check-input" disabled type="radio" name="test" id="id_test_1" value="2">'
+                '<label class="form-check-label" for="id_test_1">two</label>'
+                "</div>"
+                "</div>"
+                "</div>"
+            ),
+        )
diff --git a/tests/test_bootstrap_messages.py b/tests/test_bootstrap_messages.py
@@ -54,8 +54,6 @@ def test_bootstrap_messages_with_other_content(self):
 
     def test_bootstrap_messages_with_safe_message(self):
         messages = [Message(DEFAULT_MESSAGE_LEVELS.INFO, mark_safe("Click <a href='https://www.github.com/'>here</a>"))]
-        html = self.render("{% bootstrap_messages messages %}", {"messages": messages})
-        print(html)
         self.assertHTMLEqual(
             self.render("{% bootstrap_messages messages %}", {"messages": messages}),
             self._html(content="Click <a href='https://www.github.com/'>here</a>", css_class="alert-info"),