p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #15667 -- Fixed crash when indexing RadioFieldRenderer with ModelChoiceIterator. 

Regression in 86573861a9
This commit is contained in:
Tim Graham 2016-06-18 10:33:37 -04:00 committed by GitHub
parent f7a363ee1d
commit 26d0023ccc
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/forms/widgets.py
View File

@ -693,7 +693,7 @@ class ChoiceFieldRenderer(object):
self.choices = choices self.choices = choices
def __getitem__(self, idx): def __getitem__(self, idx):
choice = self.choices[idx] # Let the IndexError propagate choice = list(self.choices)[idx] # Let the IndexError propagate
return self.choice_input_class(self.name, self.value, self.attrs.copy(), choice, idx) return self.choice_input_class(self.name, self.value, self.attrs.copy(), choice, idx)
def __str__(self): def __str__(self):

7
tests/model_forms/tests.py
View File

@ -1593,6 +1593,13 @@ class ModelChoiceFieldTests(TestCase):
with self.assertNumQueries(1): with self.assertNumQueries(1):
template.render(Context({'field': field})) template.render(Context({'field': field}))
def test_modelchoicefield_index_renderer(self):
field = forms.ModelChoiceField(Category.objects.all(), widget=forms.RadioSelect)
self.assertEqual(
str(field.widget.get_renderer('foo', [])[0]),
'<label><input name="foo" type="radio" value="" /> ---------</label>'
)
def test_modelchoicefield_iterator(self): def test_modelchoicefield_iterator(self):
""" """
Iterator defaults to ModelChoiceIterator and can be overridden with Iterator defaults to ModelChoiceIterator and can be overridden with