exclude obsolete newsitem off focus space

diff --git a/panikweb/views.py b/panikweb/views.py
index 1b074eb80de29f8fdda0aa075702a50363fcc1fa..7003a923f8c74b82ea7daf8d54adf3c1a5356286 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -535,7 +535,10 @@ class News(TemplateView):
     template_name = 'news.html'
     def get_context_data(self, **kwargs):
         context = super(News, self).get_context_data(**kwargs)
-        context['focus'] = NewsItem.objects.exclude(date__gt=date.today()).filter(got_focus__isnull=False).select_related('category').order_by('-date')[:10]
+        context['focus'] = NewsItem.objects.exclude(date__gt=date.today()  # publication date
+                ).exclude(expiration_date__lt=date.today()  # expiration date
+                ).filter(got_focus__isnull=False
+                ).select_related('category').order_by('-date')[:10]
         context['news'] = NewsItem.objects.exclude(date__gt=date.today()).order_by('-date')
         return context