aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlban Gruin2018-01-11 14:09:33 +0100
committerAlban Gruin2018-01-11 14:13:57 +0100
commite710ab4b1293ecbd0f61649b4abb3072379f362f (patch)
tree8f01a9862337754f5cd627ce41594145aad739f1
parent4998865c2d5e94c53547e44aed1dc825163c0c4a (diff)
On remplace les <br /> dans le champ remarque par des retours à la
ligne lors du parsage, puis on les remplace à nouveau par des <br /> lors du rendu des templates.
-rw-r--r--management/commands/_private.py2
-rw-r--r--templates/timetable_common.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/management/commands/_private.py b/management/commands/_private.py
index 4dd9262..17a99fe 100644
--- a/management/commands/_private.py
+++ b/management/commands/_private.py
@@ -68,7 +68,7 @@ def get_event(timetable, event, event_week, today):
# On récupère le champ « remarque »
if event.notes is not None:
- course.notes = event.notes.text
+ course.notes = "\n".join(event.notes.find_all(text=True))
# On récupère le champ « nom »
if event.resources.module is not None:
diff --git a/templates/timetable_common.html b/templates/timetable_common.html
index 62b1d71..533f6c9 100644
--- a/templates/timetable_common.html
+++ b/templates/timetable_common.html
@@ -6,7 +6,7 @@
<li class="course">
<b>{{ course }}</b>{% if course.type %} ({{ course.type }}){% endif %}, de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br />
<em>{{ course.rooms.all|format_rooms }}</em>{% endif %}{% if course.notes %}<br />
- <small>Remarques : {{ course.notes }}</small>{% endif %}
+ <small>Remarques : {{ course.notes|linebreaksbr }}</small>{% endif %}
</li>{% endfor %}
</ul>
</section>{% empty %}