aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlban Gruin2017-11-01 15:20:55 +0100
committerAlban Gruin2017-11-01 15:20:55 +0100
commit2d68777e50e261cb793186321947b677ed9de692 (patch)
treef0ff34041d5eaf7606c372d370dfbd13f3cae4e1
parent912f3cca24da9d870aa191348fef901adcd55b7d (diff)
Correction des crashes provoqués lors de la génération des ICS
lorsque le type d’un cours est nul.
-rw-r--r--feeds.py7
-rw-r--r--templates/timetable_common.html2
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 %}