From 2d68777e50e261cb793186321947b677ed9de692 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Wed, 1 Nov 2017 15:20:55 +0100
Subject: Correction des crashes provoqués lors de la génération des ICS
 lorsque le type d’un cours est nul.

---
 feeds.py                        | 7 ++++++-
 templates/timetable_common.html | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/feeds.py b/feeds.py
index 66be12e..aced5e6 100644
--- a/feeds.py
+++ b/feeds.py
@@ -75,6 +75,11 @@ class IcalFeed(Feed):
     def item_link(self, item):
         return ""
 
+    def item_summary(self, item):
+        if item.type is not None:
+            return item.name + " (" + item.type + ")"
+        return item.name
+
     def items(self, obj):
         return Course.objects.get_courses_for_group(obj)
 
@@ -83,7 +88,7 @@ class IcalFeed(Feed):
                 "dtstart": item.begin,
                 "dtend": item.end,
                 "dtstamp": item.last_update,
-                "summary": item.name + " (" + item.type + ")",
+                "summary": self.item_summary(item),
                 "location": format_rooms(item.rooms.all())}
 
 
diff --git a/templates/timetable_common.html b/templates/timetable_common.html
index 9a2c27e..62b1d71 100644
--- a/templates/timetable_common.html
+++ b/templates/timetable_common.html
@@ -4,7 +4,7 @@
         <h3>{% filter title %}{{ day.0.begin|date:"l j F o" }}{% endfilter %} &ndash; de {{ day.0.begin|date:"H:i" }} à {% with day|last as last %}{{ last.end|date:"H:i" }}{% endwith %}</h3>
         <ul>{% for course in day %}
           <li class="course">
-            <b>{{ course }}</b> ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br />
+            <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 %}
           </li>{% endfor %}
-- 
cgit v1.2.1