summaryrefslogtreecommitdiff
path: root/chimere/models.py
diff options
context:
space:
mode:
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