diff options
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 5 | ||||
| -rw-r--r-- | chimere/tests.py | 6 | ||||
| -rw-r--r-- | chimere/views.py | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index 2b806ca..0182b66 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -62,8 +62,9 @@ def display_news(context, display=False): # Retrieve active markers today = date.today() after = today + timedelta(settings.CHIMERE_DAYS_BEFORE_EVENT) - q = Marker.objects.filter(status='A', start_date__lte=after - ).filter(Q(end_date__gte=today)|Q(end_date__isnull=True)) + q = Marker.objects.filter(status='A').filter(start_date__lte=after + ).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) diff --git a/chimere/tests.py b/chimere/tests.py index d3dc3de..175a6b8 100644 --- a/chimere/tests.py +++ b/chimere/tests.py @@ -385,6 +385,12 @@ class NewsTest(TestCase): def setUp(self): self.areas = areas_setup() self.markers = marker_setup() + current_date = datetime.datetime.now() + marker = Marker.objects.create(name="Marker 4", status='A', + point='SRID=4326;POINT(-4.5 48.45)', + available_date=current_date - datetime.timedelta(days=90), + start_date=current_date - datetime.timedelta(days=90), + end_date=None) self.news = [] self.news.append(News.objects.create(title=u"Test news 1", available=True)) diff --git a/chimere/views.py b/chimere/views.py index db63809..6a51394 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2008-2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2008-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # # RSS : Copyright (C) 2010 Pierre Clarenc <pierre.crc_AT_gmailDOTcom>, # Samuel Renard <renard.samuel_AT_gmailDOTcom>, |