From e710ab4b1293ecbd0f61649b4abb3072379f362f Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Thu, 11 Jan 2018 14:09:33 +0100
Subject: 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.

---
 management/commands/_private.py | 2 +-
 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 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 %}
-- 
cgit v1.2.1


From 32cfe5e60b60d7859f6e4fb3b4cba03d47293918 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Thu, 11 Jan 2018 20:50:35 +0100
Subject: Version 0.12.1

---
 __init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__init__.py b/__init__.py
index 03ae5ff..f75615a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,7 +13,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION = "0.12.0"
+VERSION = "0.12.1"
 __version__ = VERSION
 
 default_app_config = "edt.apps.EdtConfig"
-- 
cgit v1.2.1