Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Radio select option disabled #632

Merged
merged 4 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
id="{{ option.attrs.id }}"
{% if option.value != None %} value="{{ option.value|stringformat:'s' }}"
{% if option.attrs.checked %} checked="checked"{% endif %}{% endif %}
{% if widget.attrs.disabled %} disabled{% endif %}>
{% if widget.attrs.disabled or option.attrs.disabled %} disabled{% endif %}>
<label class="form-check-label" for="{{ option.attrs.id }}">{{ option.label }}</label>
</div>
{% endfor %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
id="{{ option.attrs.id }}"
{% if option.value != None %} value="{{ option.value|stringformat:'s' }}"
{% if option.attrs.checked %} checked="checked"{% endif %}{% endif %}
{% if widget.attrs.disabled %} disabled{% endif %}
{% if widget.attrs.disabled or option.attrs.disabled %} disabled{% endif %}
{% if widget.required %} required{% endif %}>
<label class="btn btn-outline-primary" for="{{ option.attrs.id }}">{{ option.label }}</label>
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion src/django_bootstrap5/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


class RadioSelectButtonGroup(RadioSelect):
"""A RadioSelect that renders as a horizontal button groep."""
"""A RadioSelect that renders as a horizontal button group."""

template_name = "django_bootstrap5/widgets/radio_select_button_group.html"

Expand Down
46 changes: 46 additions & 0 deletions tests/test_bootstrap_field_radio_select.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,31 @@ class DisabledSelectTestForm(forms.Form):
)


class RadioSelectWithDisabledOptions(forms.RadioSelect):

def __init__(self, attrs=None, choices=(), *, disabled_values=()):
super().__init__(attrs)
self.choices = choices
self.disabled_values = set(disabled_values)

def create_option(self, name, value, *args, **kwargs):
option = super().create_option(name, value, *args, **kwargs)
if value in self.disabled_values:
option["attrs"]["disabled"] = True
return option


class DisabledOptionSelectTestForm(forms.Form):
test = forms.ChoiceField(
choices=(
(1, "one"),
(2, "two"),
),
widget=RadioSelectWithDisabledOptions(disabled_values={1}),
)



class BootstrapFieldSelectTestCase(BootstrapTestCase):
def test_select(self):
"""Test field with select widget."""
Expand Down Expand Up @@ -111,3 +136,24 @@ def test_disabled_select(self):
"</div>"
),
)

def test_single_disabled_option(self):
"""Test field with a disabled option."""
self.assertHTMLEqual(
self.render("{% bootstrap_field form.test %}", context={"form": DisabledOptionSelectTestForm()}),
(
'<div class="django_bootstrap5-req mb-3">'
'<label class="form-label">Test</label>'
'<div class="" 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" type="radio" name="test" id="id_test_1" value="2">'
'<label class="form-check-label" for="id_test_1">two</label>'
"</div>"
"</div>"
"</div>"
),
)
45 changes: 45 additions & 0 deletions tests/test_bootstrap_field_radio_select_button_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,32 @@ class DisabledSelectTestForm(forms.Form):
)


class RadioSelectButtonGroupWithDisabledOptions(RadioSelectButtonGroup):

def __init__(self, attrs=None, choices=(), *, disabled_values=()):
super().__init__(attrs)
self.choices = choices
self.disabled_values = set(disabled_values)

def create_option(self, name, value, *args, **kwargs):
option = super().create_option(name, value, *args, **kwargs)
if value in self.disabled_values:
option["attrs"]["disabled"] = True
return option


class DisabledOptionSelectTestForm(forms.Form):
test = forms.ChoiceField(
choices=(
(1, "one"),
(2, "two"),
),
widget=RadioSelectButtonGroupWithDisabledOptions(disabled_values={1}),
)




class BootstrapFieldSelectTestCase(BootstrapTestCase):
def test_select(self):
"""Test field with select widget."""
Expand Down Expand Up @@ -105,3 +131,22 @@ def test_disabled_select(self):
"</div>"
),
)

def test_single_disabled_option(self):
"""Test field with a disabled option."""
self.assertHTMLEqual(
self.render("{% bootstrap_field form.test %}", context={"form": DisabledOptionSelectTestForm()}),
(
'<div class="django_bootstrap5-req mb-3">'
'<label class="form-label">Test</label>'
'<div id="id_test" class="btn-group" role="group">'
'<input type="radio" class=" btn-check" autocomplete="off" name="test" id="id_test_0" value="1" '
"disabled required>"
'<label class="btn btn-outline-primary" for="id_test_0">one</label>'
'<input type="radio" class=" btn-check" autocomplete="off" name="test" id="id_test_1" value="2" '
"required>"
'<label class="btn btn-outline-primary" for="id_test_1">two</label>'
"</div>"
"</div>"
),
)
Loading