diff options
author | Alban Gruin | 2018-01-11 14:09:33 +0100 |
---|---|---|
committer | Alban Gruin | 2018-01-11 14:09:33 +0100 |
commit | 81cb9b8c6a96fa8529c6d7f6ca55dfd56a1f2e5d (patch) | |
tree | 7e80f5d627a4b2c2d34e324d8f09a0c248d35f8d | |
parent | 8a71b0a55847e8783006b5a9514f64e0129578c9 (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.py | 2 | ||||
-rw-r--r-- | templates/timetable_common.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/management/commands/_private.py b/management/commands/_private.py index 171b6e9..0a3d5fb 100644 --- a/management/commands/_private.py +++ b/management/commands/_private.py @@ -68,7 +68,7 @@ def get_event(source, 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 d9e4ec7..21300f1 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>{% if group_mode %}{{ course.rooms.all|format_rooms }}{% else %}{{ course.groups.all|join:", " }}{% endif %}</em>{% endif %}{% if course.notes %}<br /> - <small>Remarques : {{ course.notes }}</small>{% endif %} + <small>Remarques : {{ course.notes|linebreaksbr }}</small>{% endif %} </li>{% endfor %} </ul> </section>{% empty %} |