fix bugs on signals

aircox/admin.py

@@ -81,7 +81,7 @@ class ProgramAdmin(NameableAdmin):
     schedule.boolean = True
     schedule.short_description = _("Schedule")
 
-    list_display = ('id', 'name', 'active', 'schedule', 'sync')
+    list_display = ('id', 'name', 'active', 'schedule', 'sync', 'station')
     fields = NameableAdmin.fields + [ 'active', 'station','sync' ]
     inlines = [ ScheduleInline, StreamInline ]
 

aircox/signals.py

@@ -12,6 +12,7 @@ import aircox.utils as utils
 
 @receiver(post_save, sender=models.Schedule)
 def schedule_post_saved(sender, instance, created, *args, **kwargs):
+    # TODO: case instance.program has changed
     if not instance.program.sync:
         return
 
@@ -19,8 +20,12 @@ def schedule_post_saved(sender, instance, created, *args, **kwargs):
     if not initial or not instance.changed(['date','duration', 'frequency']):
         return
 
+    if not initial.get('date') or not initial.get('duration') or not initial.get('frequency'):
+        return
+
     # old schedule and timedelta
     old_sched = models.Schedule(
+        program = instance.program,
         date = initial['date'],
         duration = initial['duration'],
         frequency = initial['frequency'],

aircox/templates/aircox/controllers/stats.html

@@ -1,12 +1,14 @@
-{% extends "aircox/controllers/base_site.html" %}
+{% extends "admin/base_site.html" %}
+{# {% extends "aircox/controllers/base_site.html" %} #}
 {% load i18n %}
 
 {% block title %}
-<h1>Statistics of the stations</h1>
+{% trans "Statistics of the stations" %}
 {% endblock %}
 
 {% block content %}
-<div id='stats'>
+<div id='content'>
+    <h1>{% trans "Statistics of the stations" %}</h1>
 
     {# TODO here #}
     <form action="?" method="GET">
@@ -58,10 +60,10 @@
             {% endfor %}
 
             <tr class="bottom">
-                <td>{{ stats.date|date:'d/m/Y' }}</td>
+                <th>{{ stats.date|date:'d/m/Y' }}</th>
-                <td>{% trans "Total" %}</td>
+                <th>{% trans "Total" %}</th>
                 {# TODO: translation block #}
-                <td>
+                <th>
                     {% with stats.items|length as items_count %}
                     {% with stats.count as tracks_count %}
                     {% blocktrans %}
@@ -69,11 +71,11 @@
                     {% endblocktrans %}
                     {% endwith %}
                     {% endwith %}
-                </td>
+                </th>
-                <td>{% for tag, count, average in stats.tags %}
+                <th>{% for tag, count, average in stats.tags %}
                     <span>{{ tag }}: <b>{{ average|floatformat }}%</b> ({{ count }})<br>
                 {% endfor %}
-                </td>
+                </th>
             </tr>
         </table>
     </section>

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.related:
-            if self.siblings:
+            qs = self.__get_related(qs)
-                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)
         # 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 (
+    for page in instance.page.all():
-            instance.page.first().specific.body or
+        if page.specific.body or Page.objects.descendant_of(page).count():
-            Page.objects.descendant_of(instance).count()
+            continue
-            ):
+        page.delete()
-        return
-    instance.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:
+    for page in instance.page.all():
-        return
+        if page.specific.body or Page.objects.descendant_of(page).count():
-    instance.page.delete()
+            continue
+        page.delete()
 
 

instance/base_settings.py

@@ -32,6 +32,7 @@ except:
 
 # Application definition
 INSTALLED_APPS = (
+    'jet',
     'wagtail.wagtailforms',
     'wagtail.wagtailredirects',
     'wagtail.wagtailembeds',

instance/urls.py

@@ -26,6 +26,7 @@ import aircox.urls
 
 
 urlpatterns = [
+    url(r'^jet/', include('jet.urls', 'jet')),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^aircox/', include(aircox.urls.urls)),