diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-31 09:52:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-31 09:52:28 +0100 |
| commit | b845195fda9c4e9fb79c3f6272d8de202822f57e (patch) | |
| tree | b8014d379e6f5389aa044b2f4b780a2608a794c3 /chimere/models.py | |
| parent | 61eef049a7c0b476db82b94f61f3a45e21a63ee4 (diff) | |
| parent | 05c66ec70a19ffb5ae22955adcf32bf7190c42ae (diff) | |
| download | Chimère-b845195fda9c4e9fb79c3f6272d8de202822f57e.tar.bz2 Chimère-b845195fda9c4e9fb79c3f6272d8de202822f57e.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/templates/chimere/blocks/multimedia_file.html
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/views.py
Diffstat (limited to 'chimere/models.py')
| -rw-r--r-- | chimere/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chimere/models.py b/chimere/models.py index 077419b..a34635d 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -1100,11 +1100,11 @@ def getDateCondition(): after = (datetime.datetime.now() + \ datetime.timedelta(settings.CHIMERE_DAYS_BEFORE_EVENT) ).strftime('%Y-%m-%d') - date_condition = " and %(alias)s.start_date is null or " + date_condition = " and (%(alias)s.start_date is null or " date_condition += "(%(alias)s.start_date >= '" + now + "' and " date_condition += "%(alias)s.start_date <='" + after + "')" date_condition += " or (%(alias)s.start_date <='" + now + "' and " - date_condition += "%(alias)s.end_date >='" + now + "') " + date_condition += "%(alias)s.end_date >='" + now + "')) " return date_condition class SimplePoint: |