]> git.parisson.com Git - mezzo.git/commitdiff
fix event description
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 22 Mar 2016 16:57:55 +0000 (17:57 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 22 Mar 2016 16:57:55 +0000 (17:57 +0100)
app/sandbox/local_settings.py
app/templates/agenda/event_list.html

index 770a4fc0418cf770b41ffe03af3cd81bdd343992..3cc0a20640ab50d095a4c09fe355c43933a48e75 100644 (file)
@@ -96,5 +96,3 @@ warnings.filterwarnings(
         RuntimeWarning, r'django\.db\.models\.fields')
 
 EVENT_GOOGLE_MAPS_DOMAIN = 'maps.google.fr'
-
-TINYMCE_SETUP_JS = ''
index 93c258477a7a2ab46439fcc5a8561c98fd0323a5..15c55047f3d1e85ea7ce3f14734ac72fad15b21a 100644 (file)
@@ -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 %}