Changeset 9293

Timestamp:

10/28/08 15:01:03 (2 months ago)

Author:

brosner

Message:

Fixed #9462 -- Set the instance in an inline formset correctly so that None does not get passed through to the queryset. Thanks tobias and copelco for the ticket.

Files:

• django/trunk/django/forms/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/model_formsets/models.py (modified) (2 diffs)

django/trunk/django/forms/models.py

@@ -447 +447 @@
-                 save_as_new=False, prefix=None):
-        from django.db.models.fields.related import RelatedObject
-
+
+
+
+
-        self.save_as_new = save_as_new
-        # is there a better way to get the object descriptor?

django/trunk/tests/modeltests/model_formsets/models.py

@@ -107 +107 @@
-    date_joined = models.DateTimeField(default=datetime.datetime.now)
-    karma = models.IntegerField()
+
+# models for testing a null=True fk to a parent
+class Team(models.Model):
+    name = models.CharField(max_length=100)
+
+class Player(models.Model):
+    team = models.ForeignKey(Team, null=True)
+    name = models.CharField(max_length=100)
+    
+    def __unicode__(self):
+        return self.name
-
-__test__ = {'API_TESTS': """
@@ -702 +713 @@
-True
-
+# inlineformset_factory tests with fk having null=True. see #9462.
+# create some data that will exbit the issue
+>>> team = Team.objects.create(name=u"Red Vipers")
+>>> Player(name="Timmy").save()
+>>> Player(name="Bobby", team=team).save()
+
+>>> PlayerInlineFormSet = inlineformset_factory(Team, Player)
+>>> formset = PlayerInlineFormSet()
+>>> formset.get_queryset()
+[]
+
+>>> formset = PlayerInlineFormSet(instance=team)
+>>> formset.get_queryset()
+[<Player: Bobby>]
+
-"""}