misc: remove expired/old news items from emission page

diff --git a/panikweb/views.py b/panikweb/views.py
index 1b8b0f4066190fdbfd0c6c115848c18b99e6f09e..39bf76dfe6b9d26c00d79332e0f03ae55adcc075 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -104,7 +104,11 @@ class EmissionDetailView(DetailView, EmissionMixin):
         context = super(EmissionDetailView, self).get_context_data(**kwargs)
         context['schedules'] = Schedule.objects.select_related().filter(
                 emission=self.object).order_by('rerun', 'datetime')
         context = super(EmissionDetailView, self).get_context_data(**kwargs)
         context['schedules'] = Schedule.objects.select_related().filter(
                 emission=self.object).order_by('rerun', 'datetime')

-        context['news'] = NewsItem.objects.all().filter(emission=self.object.id).order_by('-date')[:3]
+        context['news'] = NewsItem.objects.all(
+                ).filter(emission=self.object.id
+                ).exclude(expiration_date__lt=date.today()  # expiration date
+                ).exclude(date__lt=date.today() - timedelta(days=60)
+                ).order_by('-date')[:3]

         try:
             nonstop_object = Nonstop.objects.get(slug=self.object.slug)
         except Nonstop.DoesNotExist:
         try:
             nonstop_object = Nonstop.objects.get(slug=self.object.slug)
         except Nonstop.DoesNotExist: