summaryrefslogtreecommitdiff
path: root/chimere/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-02-19 11:42:28 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-02-19 11:42:28 +0100
commit9a474d513cfacfa92ba24048c8e9f94bbe359037 (patch)
treec7297f40ceed28ceb770ea3c8c908fbbeb5d90a5 /chimere/models.py
parent7dc21de29939458f94f78c00c99c9c1403d694d1 (diff)
downloadChimère-9a474d513cfacfa92ba24048c8e9f94bbe359037.tar.bz2
Chimère-9a474d513cfacfa92ba24048c8e9f94bbe359037.zip
Better sorting of news
Diffstat (limited to 'chimere/models.py')
-rw-r--r--chimere/models.py5
1 files changed, 4 insertions, 1 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