innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #23113 -- ChoiceInput.render should take specified attrs into account. 

Thanks to Tim Graham for the review.
This commit is contained in:
Simon Charette 2014-07-27 18:59:20 -04:00
parent 729e4ae4f0
commit 80708ac772
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/forms/widgets.py
View File

@ -601,13 +601,17 @@ class ChoiceInput(SubWidget):
label_for = format_html(' for="{0}"', self.id_for_label) label_for = format_html(' for="{0}"', self.id_for_label)
else: else:
label_for = '' 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): def is_checked(self):
return self.value == self.choice_value return self.value == self.choice_value
def tag(self): def tag(self, attrs=None):
final_attrs = dict(self.attrs, type=self.input_type, name=self.name, value=self.choice_value) attrs = attrs or self.attrs
final_attrs = dict(attrs, type=self.input_type, name=self.name, value=self.choice_value)
if self.is_checked(): if self.is_checked():
final_attrs['checked'] = 'checked' final_attrs['checked'] = 'checked'
return format_html('<input{0} />', flatatt(final_attrs)) return format_html('<input{0} />', flatatt(final_attrs))

6
tests/forms_tests/tests/test_widgets.py
View File

@ -687,6 +687,12 @@ beatle J R Ringo False""")
self.assertFalse(r[1].is_checked()) self.assertFalse(r[1].is_checked())
self.assertEqual((r[1].name, r[1].value, r[1].choice_value, r[1].choice_label), ('beatle', 'J', 'P', 'Paul')) self.assertEqual((r[1].name, r[1].value, r[1].choice_value, r[1].choice_label), ('beatle', 'J', 'P', 'Paul'))
# These individual widgets can accept extra attributes if manually rendered.
self.assertHTMLEqual(
r[1].render(attrs={'extra': 'value'}),
'<label><input type="radio" extra="value" name="beatle" value="P" /> Paul</label>'
)
with self.assertRaises(IndexError): with self.assertRaises(IndexError):
r[10] r[10]