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

Fixed #18829 -- Fixed ModelChoiceIterator length 

Thanks facundo.olano at gmail.com for the report and thikonom for
the initial patch.
This commit is contained in:
Klaas van Schelven 2013-02-23 20:11:47 +01:00 committed by Claude Paroz
parent 150e202172
commit 1c11ee6345
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/forms/models.py
View File

@ -917,7 +917,8 @@ class ModelChoiceIterator(object):
yield self.choice(obj) yield self.choice(obj)
def __len__(self): def __len__(self):
return len(self.queryset) return len(self.queryset) +\
(1 if self.field.empty_label is not None else 0)
def choice(self, obj): def choice(self, obj):
return (self.field.prepare_value(obj), self.field.label_from_instance(obj)) return (self.field.prepare_value(obj), self.field.label_from_instance(obj))

1
tests/modeltests/model_forms/tests.py
View File

@ -989,6 +989,7 @@ class OldFormForXTests(TestCase):
(c2.pk, "It's a test"), (c2.pk, "It's a test"),
(c3.pk, 'Third'), (c3.pk, 'Third'),
(c4.pk, 'Fourth')]) (c4.pk, 'Fourth')])
self.assertEqual(5, len(f.choices))
with self.assertRaises(ValidationError): with self.assertRaises(ValidationError):
f.clean('') f.clean('')
with self.assertRaises(ValidationError): with self.assertRaises(ValidationError):