Fix news filtering on front page

1 files changed, 4 insertions, 4 deletions

diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index d76e14e..fd1bc75 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -51,13 +51,13 @@ def get_news(area=None):
         # Retrieve active markers
         today = date.today()
         after = today + timedelta(settings.CHIMERE_DAYS_BEFORE_EVENT)
-        q = Marker.objects.filter(status='A')
+        q = Marker.objects.filter(status='A', start_date__lte=after).filter(
+             Q(end_date__gte=today)|
+            (Q(end_date__isnull=True) & Q(start_date__gte=today)))
+
         if not'CHIMERE_ALL_DATED_ARE_FRONT' in dir(settings)\
            or not settings.CHIMERE_ALL_DATED_ARE_FRONT:
             q = q.filter(is_front_page=True)
-        q = q.filter(start_date__lte=after, is_front_page=True
-            ).filter(Q(end_date__gte=today)|
-            (Q(end_date__isnull=True) & Q(start_date__gte=today)))
         if area:
             q = q.filter(area.getIncludeMarker())
         news += list(q)