remove topik from itemtopik model

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

diff --git a/panikombo/models.py b/panikombo/models.py
index 2f966897d9f1eab142dcad2ef78c33d654bfd9d2..2907b86cb22fdf868a7efde55422654cbcd39e10 100644 (file)
--- a/panikombo/models.py
+++ b/panikombo/models.py
@@ -124,7 +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(Lower('title')).distinct()
+            episodes_queryset = episodes_queryset.order_by('first_diffusion').distinct()
         elif self.period == 1:
             episodes_queryset = episodes_queryset.extra(
                     select={ 'first_diffusion': 'emissions_diffusion.datetime', },
@@ -240,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