From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 22 Mar 2016 16:57:55 +0000 (+0100)
Subject: fix event description
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7377f141220276ec933c30a249d5cf72156a9aae;p=mezzo.git

fix event description
---

diff --git a/app/sandbox/local_settings.py b/app/sandbox/local_settings.py
index 770a4fc0..3cc0a206 100644
--- a/app/sandbox/local_settings.py
+++ b/app/sandbox/local_settings.py
@@ -96,5 +96,3 @@ warnings.filterwarnings(
         RuntimeWarning, r'django\.db\.models\.fields')
 
 EVENT_GOOGLE_MAPS_DOMAIN = 'maps.google.fr'
-
-TINYMCE_SETUP_JS = ''
diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html
index 93c25847..15c55047 100644
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@ -98,7 +98,7 @@
     {% block event_list_event_content %}
         {% editable event.content %}
             <div class="event__description">
-                {{ event.description_from_content|safe }}
+                {{ event.description|safe }}
             </div>
         {% endeditable %}
     {% endblock %}