Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Fixed #14144 -- Made sure custom validators are called in Mod…

…elMultipleChoiceFields. Thanks, matiasb.

Backport from trunk (r14886).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 32bf35da09660604e8c65c1ac75f28b1918cf91c 1 parent 69edfc7
@jezdez jezdez authored
View
3  django/forms/models.py
@@ -1035,6 +1035,9 @@ def clean(self, value):
for val in value:
if force_unicode(val) not in pks:
raise ValidationError(self.error_messages['invalid_choice'] % val)
+ # Since this overrides the inherited ModelChoiceField.clean
+ # we run custom validators here
+ self.run_validators(value)
return qs
def prepare_value(self, value):
View
16 tests/regressiontests/model_forms_regress/tests.py
@@ -31,6 +31,22 @@ def test_model_multiple_choice_number_of_queries(self):
selected = f.clean([1, 3, 5, 7, 9])
self.assertEquals(len(db.connection.queries), 1)
+ def test_model_multiple_choice_run_validators(self):
+ """
+ Test that ModelMultipleChoiceField run given validators (#14144).
+ """
+ for i in range(30):
+ Person.objects.create(name="Person %s" % i)
+
+ self._validator_run = False
+ def my_validator(value):
+ self._validator_run = True
+
+ f = forms.ModelMultipleChoiceField(queryset=Person.objects.all(),
+ validators=[my_validator])
+ f.clean([1,2])
+ self.assertTrue(self._validator_run)
+
class TripleForm(forms.ModelForm):
class Meta:
model = Triple
Please sign in to comment.
Something went wrong with that request. Please try again.