Changes in [139:d6ffc8e4169d:140:775c9f90987e]

Files:

• cyclope/models.py (modified) (1 diff)
• cyclope/settings.py (modified) (2 diffs)
• demo/cyclope_project/db/site.db (modified) (previous)

cyclope/models.py

@@ -245 +245 @@
                                                object_id_field='self_id',
                                                content_type_field='self_type')
-
-    def delete(self, using=None):
-        # the cascade delete does not delete the RelatedContent elements
-        # where this object is the related content, so we do it here.
-        ctype = ContentType.objects.get_for_model(self)
-        related_from = RelatedContent.objects.filter(other_type=ctype,
-                                                    other_id=self.id)
-        for obj in related_from:
-            obj.delete()
-        super(BaseContent, self).delete(using)
-
     def pictures(self):
         if self.related_contents:

cyclope/settings.py

@@ -26 +26 @@
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
-from django.db.models.signals import post_save
+from django.db.models.signals import post_save, pre_delete
 
 from cyclope.models import SiteSettings
@@ -110 +110 @@
 
 post_save.connect(_refresh_site_settings, sender=SiteSettings)
+
+from django.contrib.contenttypes.models import ContentType
+from cyclope.models import RelatedContent
+
+def _delete_related_contents(sender, instance, **kwargs):
+    # the cascade delete does not delete the RelatedContent elements
+    # where this object is the related content, so we do it here.
+    ctype = ContentType.objects.get_for_model(sender)
+    if hasattr(instance, 'id'):
+        print "instance:", instance.id
+        related_from = RelatedContent.objects.filter(other_type=ctype,
+                                                    other_id=instance.id)
+        for obj in related_from:
+            obj.delete()
+
+pre_delete.connect(_delete_related_contents)