Ticket #10922: formset.2.diff

django/forms/models.py

@@ -395 +395 @@
             return len(self.get_queryset())
         return super(BaseModelFormSet, self).initial_form_count()
 
+    def _construct_forms(self, *args, **kwargs):
+        if self.is_bound:
+            self._queryset_dict = dict([(o.pk, o) for o in self.get_queryset()])
+        super(BaseModelFormSet, self)._construct_forms(*args, **kwargs)
+        if self.is_bound:
+            del self._queryset_dict
+
     def _construct_form(self, i, **kwargs):
-        if i < self.initial_form_count():
+        if self.is_bound and i < self.initial_form_count():
+            pk = self.data["%s-%s" % (self.add_prefix(i), self.model._meta.pk.name)]
+            pk_field = self.model._meta.pk
+            pk = pk_field.get_db_prep_lookup('exact', pk)
+            if isinstance(pk, list):
+                pk = pk[0]
+            kwargs['instance'] = self._queryset_dict.get(pk)
+        if i < self.initial_form_count() and not kwargs.get('instance'):
             kwargs['instance'] = self.get_queryset()[i]
         return super(BaseModelFormSet, self)._construct_form(i, **kwargs)
 
@@ -499 +513 @@
             return ((not pk.editable) or (pk.auto_created or isinstance(pk, AutoField))
                 or (pk.rel and pk.rel.parent_link and pk_is_editable(pk.rel.to._meta.pk)))
         if pk_is_editable(pk):
-            try:
-                pk_value = self.get_queryset()[index].pk
-            except IndexError:
+            if form.is_bound:
+                pk_value = form.instance.pk
+            else:
                 pk_value = None
             if isinstance(pk, OneToOneField) or isinstance(pk, ForeignKey):
                 qs = pk.rel.to._default_manager.get_query_set()

tests/modeltests/model_formsets/models.py

@@ -58 +58 @@
 class Place(models.Model):
     name = models.CharField(max_length=50)
     city = models.CharField(max_length=50)
-    
+
     def __unicode__(self):
         return self.name
 
@@ -85 +85 @@
 
 class Restaurant(Place):
     serves_pizza = models.BooleanField()
-    
+
     def __unicode__(self):
         return self.name
 
@@ -573 +573 @@
 ...     print book.title
 Les Fleurs du Mal
 
-Test inline formsets where the inline-edited object uses multi-table inheritance, thus 
+Test inline formsets where the inline-edited object uses multi-table inheritance, thus
 has a non AutoField yet auto-created primary key.
 
 >>> AuthorBooksFormSet3 = inlineformset_factory(Author, AlternateBook, can_delete=False, extra=1)
@@ -734 +734 @@
 ...     'ownerprofile-0-owner': u'1',
 ...     'ownerprofile-0-age': u'55',
 ... }
->>> formset = FormSet(data, instance=owner)
+>>> formset = FormSet(data, instance=owner) # this seems to be testing the behavior we want to avoid... hrm.
 >>> formset.is_valid()
 True
 >>> formset.save()
 [<OwnerProfile: Joe Perry is 55>]
 
-# ForeignKey with unique=True should enforce max_num=1 
+# ForeignKey with unique=True should enforce max_num=1
 
 >>> FormSet = inlineformset_factory(Place, Location, can_delete=False)
 >>> formset = FormSet(instance=place)