Ticket #10672: 10672.2.diff

django/db/models/base.py

@@ -420 +420 @@
         ('raw' and 'cls').
         """
         assert not (force_insert and force_update)
-        if not cls:
-            cls = self.__class__
+        klass = cls
+        if not klass:
+            klass = self.__class__
             meta = self._meta
             signal = True
             signals.pre_save.send(sender=self.__class__, instance=self, raw=raw)
         else:
-            meta = cls._meta
+            meta = klass._meta
             signal = False
 
         # If we are in a raw save, save the object exactly as presented.
@@ -441 +442 @@
                 if field and getattr(self, parent._meta.pk.attname) is None and getattr(self, field.attname) is not None:
                     setattr(self, parent._meta.pk.attname, getattr(self, field.attname))
 
-                self.save_base(cls=parent)
+                record_exists = not self.save_base(cls=parent)
                 if field:
                     setattr(self, field.attname, self._get_pk_val(parent._meta))
-            if meta.proxy:
-                return
 
         if not meta.proxy:
             non_pks = [f for f in meta.local_fields if not f.primary_key]
@@ -454 +453 @@
             pk_val = self._get_pk_val(meta)
             pk_set = pk_val is not None
             record_exists = True
-            manager = cls._base_manager
+            manager = klass._base_manager
             if pk_set:
                 # Determine whether a record with the primary key already exists.
                 if (force_update or (not force_insert and
@@ -496 +495 @@
             signals.post_save.send(sender=self.__class__, instance=self,
                 created=(not record_exists), raw=raw)
 
+        if cls:
+            return (not record_exists)
+
     save_base.alters_data = True
 
     def _collect_sub_objects(self, seen_objs, parent=None, nullable=False):

tests/modeltests/proxy_models/models.py

@@ -259 +259 @@
 >>> OtherPerson._default_manager.all()
 [<OtherPerson: barney>, <OtherPerson: wilma>]
 
+# Test save signals for proxy models
+>>> from django.db.models import signals
+>>> def proxy_pre_save(*args, **kwargs): print u"proxy pre save"
+...
+>>> def proxy_post_save(*args, **kwargs): print u"proxy post save"
+...
+>>> signals.pre_save.connect(proxy_pre_save, sender=MyPerson)
+>>> signals.post_save.connect(proxy_post_save, sender=MyPerson)
+>>> dino = MyPerson.objects.create(name=u"dino")
+proxy pre save
+proxy post save
+
+# And test save signals for proxy proxy models
+>>> from django.db.models import signals
+>>> def proxy_proxy_pre_save(*args, **kwargs): print u"proxy proxy pre save"
+...
+>>> def proxy_proxy_post_save(*args, **kwargs): print u"proxy proxy post save"
+...
+>>> signals.pre_save.connect(proxy_proxy_pre_save, sender=MyPersonProxy)
+>>> signals.post_save.connect(proxy_proxy_post_save, sender=MyPersonProxy)
+>>> dino = MyPersonProxy.objects.create(name=u"pebbles")
+proxy proxy pre save
+proxy proxy post save
+
 # A proxy has the same content type as the model it is proxying for (at the
 # storage level, it is meant to be essentially indistinguishable).
 >>> ctype = ContentType.objects.get_for_model
@@ -266 +290 @@
 True
 
 >>> MyPersonProxy.objects.all()
-[<MyPersonProxy: barney>, <MyPersonProxy: fred>]
+[<MyPersonProxy: barney>, <MyPersonProxy: dino>, <MyPersonProxy: fred>, <MyPersonProxy: pebbles>]
 
 >>> u = User.objects.create(name='Bruce')
 >>> User.objects.all()