diff options
| author | Simon Charette <charette.s@gmail.com> | 2014-07-27 18:59:20 -0400 |
|---|---|---|
| committer | Simon Charette <charette.s@gmail.com> | 2014-07-28 10:01:07 -0400 |
| commit | 80708ac77204c491f86c6a8215aaba8cf0989154 (patch) | |
| tree | 38b7ab6899c2bb4f91fc263be69a01cef145e84e /django/forms | |
| parent | 729e4ae4f0730585ac4640e7fa3aa06374677ff2 (diff) | |
Fixed #23113 -- ChoiceInput.render should take specified attrs into account.
Thanks to Tim Graham for the review.
Diffstat (limited to 'django/forms')
| -rw-r--r-- | django/forms/widgets.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py index ee8ab5c129..a16b554385 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -601,13 +601,17 @@ class ChoiceInput(SubWidget): label_for = format_html(' for="{0}"', self.id_for_label) else: label_for = '' - return format_html('<label{0}>{1} {2}</label>', label_for, self.tag(), self.choice_label) + attrs = dict(self.attrs, **attrs) if attrs else self.attrs + return format_html( + '<label{0}>{1} {2}</label>', label_for, self.tag(attrs), self.choice_label + ) def is_checked(self): return self.value == self.choice_value - def tag(self): - final_attrs = dict(self.attrs, type=self.input_type, name=self.name, value=self.choice_value) + def tag(self, attrs=None): + attrs = attrs or self.attrs + final_attrs = dict(attrs, type=self.input_type, name=self.name, value=self.choice_value) if self.is_checked(): final_attrs['checked'] = 'checked' return format_html('<input{0} />', flatatt(final_attrs)) |
