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/views.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/views.py')
| -rw-r--r-- | chimere/views.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chimere/views.py b/chimere/views.py index 835848a..edd0ac4 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -528,6 +528,8 @@ def getDetail(request, area_name, marker_id): net_dct["body"] = _(settings.CHIMERE_MODIF_EMAIL) response_dct['modif_by_email'] = 'mailto:?to=%(to)s&subject='\ '%(text)s&body=%(body)s%(url)s' % net_dct + # to be sure there is unique IDs during a browsing + response_dct['time_now'] = datetime.datetime.now().strftime('%H%M%S') response_dct['dated'] = settings.CHIMERE_DAYS_BEFORE_EVENT \ and marker.start_date return render_to_response('chimere/detail.html', response_dct, |