diff options
author | Tim Graham <timograham@gmail.com> | 2014-07-08 15:58:14 -0400 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2014-07-09 07:59:20 -0400 |
commit | 5e2c4a4bd1f86962842783e0b42ada7b9c14c247 (patch) | |
tree | 67bf0428da8e8c165c25f381823c5b229b9b175b /tests/model_formsets_regress | |
parent | 5ebf03b7dd2d1c215f5c0b725083d36379a7ac5b (diff) | |
download | django-5e2c4a4bd1f86962842783e0b42ada7b9c14c247.tar.gz |
Fixed #13794 -- Fixed to_field usage in BaseInlineFormSet.
Thanks sebastien at clarisys.fr for the report and gautier
for the patch.
Diffstat (limited to 'tests/model_formsets_regress')
-rw-r--r-- | tests/model_formsets_regress/models.py | 11 | ||||
-rw-r--r-- | tests/model_formsets_regress/tests.py | 36 |
2 files changed, 46 insertions, 1 deletions
diff --git a/tests/model_formsets_regress/models.py b/tests/model_formsets_regress/models.py index 77ee5a2a16..c9ded9e761 100644 --- a/tests/model_formsets_regress/models.py +++ b/tests/model_formsets_regress/models.py @@ -12,6 +12,17 @@ class UserSite(models.Model): data = models.IntegerField() +class UserProfile(models.Model): + user = models.ForeignKey(User, unique=True, to_field="username") + about = models.TextField() + + +class ProfileNetwork(models.Model): + profile = models.ForeignKey(UserProfile, to_field="user") + network = models.IntegerField() + identifier = models.IntegerField() + + class Place(models.Model): name = models.CharField(max_length=50) diff --git a/tests/model_formsets_regress/tests.py b/tests/model_formsets_regress/tests.py index 7d400d2f87..f0ff06f875 100644 --- a/tests/model_formsets_regress/tests.py +++ b/tests/model_formsets_regress/tests.py @@ -7,7 +7,10 @@ from django.forms.models import modelform_factory, inlineformset_factory, modelf from django.test import TestCase from django.utils import six -from .models import User, UserSite, Restaurant, Manager, Network, Host +from .models import ( + User, UserSite, UserProfile, ProfileNetwork, Restaurant, Manager, Network, + Host, +) class InlineFormsetTests(TestCase): @@ -154,6 +157,37 @@ class InlineFormsetTests(TestCase): else: self.fail('Errors found on formset:%s' % form_set.errors) + def test_inline_model_with_to_field(self): + """ + #13794 --- An inline model with a to_field of a formset with instance + has working relations. + """ + FormSet = inlineformset_factory(User, UserSite, exclude=('is_superuser',)) + + user = User.objects.create(username="guido", serial=1337) + UserSite.objects.create(user=user, data=10) + formset = FormSet(instance=user) + + # Testing the inline model's relation + self.assertEqual(formset[0].instance.user_id, "guido") + + def test_inline_model_with_to_field_to_rel(self): + """ + #13794 --- An inline model with a to_field to a related field of a + formset with instance has working relations. + """ + FormSet = inlineformset_factory(UserProfile, ProfileNetwork, exclude=[]) + + user = User.objects.create(username="guido", serial=1337, pk=1) + self.assertEqual(user.pk, 1) + profile = UserProfile.objects.create(user=user, about="about", pk=2) + self.assertEqual(profile.pk, 2) + ProfileNetwork.objects.create(profile=profile, network=10, identifier=10) + formset = FormSet(instance=profile) + + # Testing the inline model's relation + self.assertEqual(formset[0].instance.profile_id, 1) + def test_formset_with_none_instance(self): "A formset with instance=None can be created. Regression for #11872" Form = modelform_factory(User, fields="__all__") |