fix bugs on signals

aircox_cms/sections.py

@@ -202,13 +202,29 @@ class ListBase(models.Model):
         ], heading=_('sorting'))
     ]
 
+    def __get_related(self, qs):
+        related = self.related and self.related.specific
+
+        if self.siblings:
+            qs = qs.sibling_of(related)
+        else:
+            qs = qs.descendant_of(related)
+
+        date = related.date if hasattr(related, 'date') else \
+                related.first_published_at
+        if self.date_filter == self.DateFilter.before_related:
+            qs = qs.filter(date__lt = date)
+        elif self.date_filter == self.DateFilter.after_related:
+            qs = qs.filter(date__gte = date)
+        return qs
+
+
     def get_queryset(self):
         """
         Get queryset based on the arguments. This class is intended to be
         reusable by other classes if needed.
         """
         from aircox_cms.models import Publication
-        related = self.related and self.related.specific
 
         # model
         if self.model:
@@ -218,18 +234,9 @@ class ListBase(models.Model):
         qs = qs.live().not_in_menu()
 
         # related
-        if related:
-            if self.siblings:
-                qs = qs.sibling_of(related)
-            else:
-                qs = qs.descendant_of(related)
+        if self.related:
+            qs = self.__get_related(qs)
 
-            date = related.date if hasattr(related, 'date') else \
-                    related.first_published_at
-            if self.date_filter == self.DateFilter.before_related:
-                qs = qs.filter(date__lt = date)
-            elif self.date_filter == self.DateFilter.after_related:
-                qs = qs.filter(date__gte = date)
         # date
         date = tz.now()
         if self.date_filter == self.DateFilter.previous:

aircox_cms/signals.py

@@ -83,7 +83,7 @@ def station_post_saved(sender, instance, created, *args, **kwargs):
     section.add_item(sections.SectionList(
         count = 15,
         url_text = _('All programs'),
-        model = ContentType.objects.get_for_model(ProgramPage),
+        model = ContentType.objects.get_for_model(models.ProgramPage),
         related = programs,
     ))
 
@@ -131,12 +131,10 @@ def program_post_saved(sender, instance, created, *args, **kwargs):
 
 @receiver(pre_delete, sender=aircox.Program)
 def program_post_deleted(sender, instance, *args, **kwargs):
-    if not instance.page.count() or (
-            instance.page.first().specific.body or
-            Page.objects.descendant_of(instance).count()
-            ):
-        return
-    instance.page.delete()
+    for page in instance.page.all():
+        if page.specific.body or Page.objects.descendant_of(page).count():
+            continue
+        page.delete()
 
 
 @receiver(post_save, sender=aircox.Diffusion)
@@ -153,8 +151,9 @@ def diffusion_post_saved(sender, instance, created, *args, **kwargs):
 
 @receiver(pre_delete, sender=aircox.Program)
 def diffusion_post_deleted(sender, instance, *args, **kwargs):
-    if not instance.page.count() or instance.page.first().specific.body:
-        return
-    instance.page.delete()
+    for page in instance.page.all():
+        if page.specific.body or Page.objects.descendant_of(page).count():
+            continue
+        page.delete()