Ticket #18508: django-forms-bug.patch

django/forms/models.py

@@ -447 +447 @@
             if isinstance(pk, list):
                 pk = pk[0]
             kwargs['instance'] = self._existing_object(pk)
-        if i < self.initial_form_count() and not kwargs.get('instance'):
+        elif i < self.initial_form_count() and not kwargs.get('instance'):
             kwargs['instance'] = self.get_queryset()[i]
         if i >= self.initial_form_count() and self.initial_extra:
             # Set initial values for extra forms

tests/regressiontests/forms/models.py

@@ -75 +75 @@
 
 class Cheese(models.Model):
    name = models.CharField(max_length=100)
+
+
+class DirectoryModel(models.Model):
+    name = models.CharField(max_length=100)
+
+class EntryModel(models.Model):
+    name = models.CharField(max_length=100)
+    directory = models.ForeignKey(DirectoryModel)

tests/regressiontests/forms/tests/__init__.py

@@ -13 +13 @@
     CustomDateTimeInputFormatsTests, SimpleDateTimeFormatTests)
 from .media import FormsMediaTestCase, StaticFormsMediaTestCase
 from .models import (TestTicket12510, ModelFormCallableModelDefault,
-    FormsModelTestCase, RelatedModelFormTests)
+    FormsModelTestCase, RelatedModelFormTests, FormsModelFormsetTestCase)
 from .regressions import FormsRegressionsTestCase
 from .util import FormsUtilTestCase
 from .validators import TestFieldWithValidators

tests/regressiontests/forms/tests/models.py

@@ -6 +6 @@
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.db import models
 from django.forms import Form, ModelForm, FileField, ModelChoiceField
-from django.forms.models import ModelFormMetaclass
+from django.forms.models import ModelFormMetaclass, inlineformset_factory
 from django.test import TestCase
 
 from ..models import (ChoiceOptionModel, ChoiceFieldModel, FileModel, Group,
-    BoundaryModel, Defaults)
+    BoundaryModel, Defaults, DirectoryModel, EntryModel)
 
 
 class ChoiceFieldForm(ModelForm):
@@ -196 +196 @@
             model=A
 
         self.assertTrue(issubclass(ModelFormMetaclass(b'Form', (ModelForm,), {'Meta': Meta}), ModelForm))
+
+class EntryModelForm(ModelForm):
+    class Meta:
+        model = EntryModel
+
+EntryModelFormset = inlineformset_factory(DirectoryModel, EntryModel, EntryModelForm)
+
+class FormsModelFormsetTestCase(TestCase):
+    def test_model_formset_outdated_deletion(self):
+        d = DirectoryModel.objects.create(name="dir")
+        e = EntryModel.objects.create(name="foo", directory=d)
+
+        # we only have id=1, id=2 doesn't exist
+        formset = EntryModelFormset(data={'form-INITIAL_FORMS':'2', 'form-TOTAL_FORMS':'2', 'form-0-id':'1', 'form-0-name':'bah', 'form-1-id':'2', 'form-1-name':'baz', 'form-1-DELETE': 'on', }, prefix="form", instance=d)
+
+        # id=1 is good, id=2 is gone but that doesn't matter as we're deleting it
+        self.assertTrue(formset.is_valid())
+
+        formset.save()
+
+        self.assertEquals(EntryModel.objects.get(pk=e.pk).name, "bah")
+        # should have ignored id=2
+        self.assertEquals(d.entrymodel_set.count(), 1)
+        self.assertEquals(EntryModel.objects.filter(pk=2).count(), 0)