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

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
This commit is contained in:
Joseph Kocherhans 2010-01-21 03:26:14 +00:00
parent 86f283d4ca
commit acc095c333
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/db/models/fields/related.py
View File

@ -770,11 +770,12 @@ class ForeignKey(RelatedField, Field):
super(ForeignKey, self).validate(value, model_instance) super(ForeignKey, self).validate(value, model_instance)
if not value: if not value:
return return
try:
self.rel.to._default_manager.get(**{self.rel.field_name:value}) qs = self.rel.to._default_manager.filter(**{self.rel.field_name:value})
except self.rel.to.DoesNotExist, e: qs = qs.complex_filter(self.rel.limit_choices_to)
raise exceptions.ValidationError( if not qs.exists():
self.error_messages['invalid'] % {'model': self.rel.to._meta.verbose_name, 'pk': value}) raise exceptions.ValidationError(self.error_messages['invalid'] % {
'model': self.rel.to._meta.verbose_name, 'pk': value})
def get_attname(self): def get_attname(self):
return '%s_id' % self.name return '%s_id' % self.name

2
tests/modeltests/validation/models.py
View File

@ -12,7 +12,7 @@ class ModelToValidate(models.Model):
name = models.CharField(max_length=100) name = models.CharField(max_length=100)
created = models.DateTimeField(default=datetime.now) created = models.DateTimeField(default=datetime.now)
number = models.IntegerField() 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) email = models.EmailField(blank=True)
url = models.URLField(blank=True) url = models.URLField(blank=True)
f_with_custom_validator = models.IntegerField(blank=True, null=True, validators=[validate_answer_to_universe]) f_with_custom_validator = models.IntegerField(blank=True, null=True, validators=[validate_answer_to_universe])

9
tests/modeltests/validation/tests.py
View File

@ -30,9 +30,16 @@ class BaseModelValidationTests(ValidationTestCase):
def test_correct_FK_value_validates(self): def test_correct_FK_value_validates(self):
parent = ModelToValidate.objects.create(number=10, name='Some Name') parent = ModelToValidate.objects.create(number=10, name='Some Name')
mtv=ModelToValidate(number=10, name='Some Name', parent_id=parent.pk) mtv = ModelToValidate(number=10, name='Some Name', parent_id=parent.pk)
self.assertEqual(None, mtv.full_clean()) 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): def test_wrong_email_value_raises_error(self):
mtv = ModelToValidate(number=10, name='Some Name', email='not-an-email') mtv = ModelToValidate(number=10, name='Some Name', email='not-an-email')
self.assertFailsValidation(mtv.full_clean, ['email']) self.assertFailsValidation(mtv.full_clean, ['email'])