remove topik from itemtopik model

[django-panik-combo.git] / panikombo / models.py

diff --git a/panikombo/models.py b/panikombo/models.py
index bdf07043fdbec68354ff01eeb5043f7f3476a98b..2907b86cb22fdf868a7efde55422654cbcd39e10 100644 (file)
--- a/panikombo/models.py
+++ b/panikombo/models.py
@@ -3,6 +3,8 @@ import os
 
 from django import template
 from django.db import models
+from django.db.models.functions import Lower
+from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 from ckeditor.fields import RichTextField
@@ -122,6 +124,7 @@ class EpisodeAutoSelectionCell(CellBase):
                     where=['''datetime = (SELECT MIN(datetime) FROM emissions_diffusion
                                            WHERE episode_id = emissions_episode.id)'''],
                     tables=['emissions_diffusion'])
+            episodes_queryset = episodes_queryset.order_by('first_diffusion').distinct()
         elif self.period == 1:
             episodes_queryset = episodes_queryset.extra(
                     select={ 'first_diffusion': 'emissions_diffusion.datetime', },
@@ -130,6 +133,7 @@ class EpisodeAutoSelectionCell(CellBase):
                                            WHERE episode_id = emissions_episode.id) AND
                                                  datetime >= CURRENT_TIMESTAMP'''],
                     tables=['emissions_diffusion'])
+            episodes_queryset = episodes_queryset.order_by('-first_diffusion').distinct()
         elif self.period == 2:
             episodes_queryset = episodes_queryset.extra(
                     select={ 'first_diffusion': 'emissions_diffusion.datetime', },
@@ -138,6 +142,7 @@ class EpisodeAutoSelectionCell(CellBase):
                                            WHERE episode_id = emissions_episode.id) AND
                                                  datetime < CURRENT_TIMESTAMP'''],
                     tables=['emissions_diffusion'])
+            episodes_queryset = episodes_queryset.order_by('-first_diffusion').distinct()
 
         return episodes_queryset
 
@@ -146,9 +151,7 @@ class EpisodeAutoSelectionCell(CellBase):
         ctx['title'] = self.title
 
         if (self.category or self.period or self.tags.count()):
-            episodes_queryset = self.get_included_items()
-            episodes_queryset = episodes_queryset.order_by('-first_diffusion').distinct()
-            ctx['episodes'] = episodes_queryset
+            ctx['episodes'] = self.get_included_items()
         else:
             ctx['episodes'] = []
 
@@ -216,6 +219,7 @@ def get_topik_image_path(instance, filename):
     return os.path.join('images', 'topik', instance.page.slug,
             os.path.basename(filename))
 
+@python_2_unicode_compatible
 class Topik(models.Model):
     page = models.ForeignKey('data.Page')
     image = models.ImageField(_('Image'),
@@ -225,10 +229,10 @@ class Topik(models.Model):
     got_focus = models.DateTimeField(default=None, null=True, blank=True)
     has_focus = models.BooleanField(default=False)
 
-    def __unicode__(self):
+    def __str__(self):
         if not self.page:
-            return super(Topik, self).__unicode__()
-        return unicode(self.page)
+            return super(Topik, self).__str__()
+        return force_text(self.page)
 
 
 class ItemTopik(models.Model):
@@ -236,8 +240,7 @@ class ItemTopik(models.Model):
             null=True, blank=True)
     episode = models.ForeignKey('emissions.Episode', verbose_name=_('Episode'),
             null=True, blank=True)
-    topik = models.ForeignKey('Topik', verbose_name='Topik',
-            null=True, blank=True)
+    page = models.ForeignKey('data.Page', null=True, blank=True)
 
 
 @register_cell_class