diff options
| author | Alban Gruin | 2018-01-11 20:51:58 +0100 |
|---|---|---|
| committer | Alban Gruin | 2018-01-11 20:51:58 +0100 |
| commit | 2a7292acd38ffc1261fe4800a15db5a27a6c871a (patch) | |
| tree | 0e7f0bf022b39774aa39599d2552b8ad1eb153e1 | |
| parent | 772caa72ce7f80bfeb5fbb1d05b57838dafd48c3 (diff) | |
| parent | 32cfe5e60b60d7859f6e4fb3b4cba03d47293918 (diff) | |
Merge branch 'stable/0.12.z' into prod/pa1ch/0.12.zv0.12.1-pa1ch
| -rw-r--r-- | __init__.py | 2 | ||||
| -rw-r--r-- | management/commands/_private.py | 2 | ||||
| -rw-r--r-- | templates/timetable_common.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/__init__.py b/__init__.py index c438abb..fa86ac8 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-pa1ch" +VERSION = "0.12.1-pa1ch" __version__ = VERSION default_app_config = "edt.apps.EdtConfig" 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 %} |