Ticket #13794: to_field_formsets.4.diff

django/forms/models.py

@@ -876 +876 @@
             form.data[form.add_prefix(self.fk.name)] = None
 
         # Set the fk value here so that the form can do its validation.
-        setattr(form.instance, self.fk.get_attname(), self.instance.pk)
+        fk_value = self.instance.pk
+        if self.fk.rel.field_name != self.fk.rel.to._meta.pk.name:
+            fk_value = getattr(self.instance, self.fk.rel.field_name)
+            fk_value = getattr(fk_value, 'pk', fk_value)
+        setattr(form.instance, self.fk.get_attname(), fk_value)
         return form
 
     @classmethod

tests/model_formsets_regress/models.py

@@ -12 +12 @@
     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)
 

tests/model_formsets_regress/tests.py

@@ -7 +7 @@
 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 +154 @@
         else:
             self.fail('Errors found on formset:%s' % form_set.errors)
 
+    def test_inline_model_with_to_field(self):
+        "An inline model with a to_field of a formset with instance have working relations. Regression for #13794"
+        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)
+
+        formset[0]
+        # Testing the inline model's relation
+        self.assertEqual(formset[0].instance.user_id, "guido")
+
+    def test_inline_model_with_to_field_to_rel(self):
+        "An inline model with a to_field to related field of a formset with instance have working relations. Regression for #13794"
+        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)
+
+        formset[0]
+        # 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__")