Ticket #14877: django-formset-delete-bug.patch

django/forms/models.py

@@ -596 +596 @@
 
         saved_instances = []
         for form in self.initial_forms:
-            pk_name = self._pk_field.name
-            raw_pk_value = form._raw_value(pk_name)
-
-            # clean() for different types of PK fields can sometimes return
-            # the model instance, and sometimes the PK. Handle either.
-            pk_value = form.fields[pk_name].clean(raw_pk_value)
-            pk_value = getattr(pk_value, 'pk', pk_value)
-
-            obj = self._existing_object(pk_value)
+            obj = form.instance
             if self.can_delete and self._should_delete_form(form):
                 self.deleted_objects.append(obj)
-                obj.delete()
+                if obj.pk != None:
+                    obj.delete()
                 continue
             if form.has_changed():
                 self.changed_objects.append((obj, form.changed_data))