diff options
| -rw-r--r-- | chimere/models.py | 5 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/chimere/models.py b/chimere/models.py index 0fc22ee..05b280c 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -419,7 +419,10 @@ class Marker(GeographicItem): @property def date(self): - if settings.CHIMERE_DAYS_BEFORE_EVENT: + if settings.CHIMERE_DAYS_BEFORE_EVENT and self.start_date: + today = datetime.date.today() + if self.end_date and self.start_date < today: + return self.end_date return self.start_date @property diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index 0490c2d..aadaa6b 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -68,7 +68,7 @@ def display_news(context, display=False): if area: q = q.filter(area.getIncludeMarker()) news += list(q) - news.sort(key=lambda x:x.date, reverse=True) + news.sort(key=lambda x:x.date) context_data['news_lst'] = news return context_data |