From 73f2cc1d1ce917528f550b8de30b980bbd5e52bb 2017-01-12 08:51:58 From: Scott Bragg Date: 2017-01-12 08:51:58 Subject: [PATCH] Merge pull request #68 from jamezpolley/lca2017 Handle slots with no Proposal --- diff --git a/symposion/schedule/views.py b/symposion/schedule/views.py index 017ab11f3cf94d041a9a74bc788b5c9180351969..3fca85e681b113c4e9f2018844a38c7eb09f2d66 100644 --- a/symposion/schedule/views.py +++ b/symposion/schedule/views.py @@ -276,17 +276,18 @@ class EventFeed(ICalFeed): def item_title(self, item): if hasattr(item.content, 'proposal'): - return item.content.title + title = item.content.title else: - item.content_override if item.content_override else "Slot" + title = item.kind if item.kind else "Slot" + return title def item_description(self, item): if hasattr(item.content, 'proposal'): description = "Speaker: %s\n%s" % ( item.content.speaker, item.content.abstract) - return description else: - return None + description = item.content_override if item.content_override else "No description" + return description def item_start_datetime(self, item): return pytz.timezone(settings.TIME_ZONE).localize(item.start_datetime)