Ticket #14234: dj14234-signal.diff

django/forms/models.py

@@ -247 +247 @@
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, error_class=ErrorList, label_suffix=':',
                  empty_permitted=False, instance=None):
+        from django.db.models.signals import post_save
         opts = self._meta
         if instance is None:
             if opts.model is None:
@@ -255 +256 @@
             self.instance = opts.model()
             object_data = {}
             self.instance._adding = True
+            def cleanup_adding(instance, created, raw, using, **kwargs):
+                if self.instance is instance:
+                    instance._adding = False
+                    post_save.disconnect(cleanup_adding, opts.model)
+            post_save.connect(receiver=cleanup_adding, sender=opts.model)
         else:
             self.instance = instance
             self.instance._adding = False