Commit acc095c3 authored by Joseph Kocherhans's avatar Joseph Kocherhans
Browse files

Fixed #12582. Model validation on ForeignKeys now respects limit_choices_to. Thanks, Honza Král. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 86f283d4

django/db/models/fields/related.py

+6 −5
Original line number Diff line number Diff line
@@ -770,11 +770,12 @@ class ForeignKey(RelatedField, Field): 
        super(ForeignKey, self).validate(value, model_instance)

        if not value:

            return

        try:

            self.rel.to._default_manager.get(**{self.rel.field_name:value})

        except self.rel.to.DoesNotExist, e:

            raise exceptions.ValidationError(

                    self.error_messages['invalid'] % {'model': self.rel.to._meta.verbose_name, 'pk': value})



        qs = self.rel.to._default_manager.filter(**{self.rel.field_name:value})

        qs = qs.complex_filter(self.rel.limit_choices_to)

        if not qs.exists():

            raise exceptions.ValidationError(self.error_messages['invalid'] % {

                'model': self.rel.to._meta.verbose_name, 'pk': value})



    def get_attname(self):

        return '%s_id' % self.name

tests/modeltests/validation/models.py

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ class ModelToValidate(models.Model): 
    name = models.CharField(max_length=100)

    created = models.DateTimeField(default=datetime.now)

    number = models.IntegerField()

    parent = models.ForeignKey('self', blank=True, null=True)

    parent = models.ForeignKey('self', blank=True, null=True, limit_choices_to={'number': 10})

    email = models.EmailField(blank=True)

    url = models.URLField(blank=True)

    f_with_custom_validator = models.IntegerField(blank=True, null=True, validators=[validate_answer_to_universe])

tests/modeltests/validation/tests.py

+8 −1
Original line number Diff line number Diff line
@@ -33,6 +33,13 @@ class BaseModelValidationTests(ValidationTestCase): 
        mtv = ModelToValidate(number=10, name='Some Name', parent_id=parent.pk)

        self.assertEqual(None, mtv.full_clean())



    def test_limitted_FK_raises_error(self):

        # The limit_choices_to on the parent field says that a parent object's

        # number attribute must be 10, so this should fail validation.

        parent = ModelToValidate.objects.create(number=11, name='Other Name')

        mtv = ModelToValidate(number=10, name='Some Name', parent_id=parent.pk)

        self.assertFailsValidation(mtv.full_clean, ['parent'])



    def test_wrong_email_value_raises_error(self):

        mtv = ModelToValidate(number=10, name='Some Name', email='not-an-email')

        self.assertFailsValidation(mtv.full_clean, ['email'])