Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #67 from jamezpolley/lca2017

Browse source 
Include author details in event description
This commit is contained in:
Scott Bragg 2017-01-12 16:27:13 +11:00 • committed by GitHub
commit b47cb32bdc
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
symposion/schedule/views.py
View file

@ -267,34 +267,36 @@ class EventFeed(ICalFeed):
product_id = '-//linux.conf.au/schedule//EN' product_id = '-//linux.conf.au/schedule//EN'
timezone = settings.TIME_ZONE timezone = settings.TIME_ZONE
filename = 'conference.ics' filename = 'conference.ics'
def items(self): def items(self):
return Slot.objects.filter( return Slot.objects.filter(
day__schedule__published=True, day__schedule__published=True,
day__schedule__hidden=False day__schedule__hidden=False
).order_by("start") ).order_by("start")
def item_title(self, item): def item_title(self, item):
if hasattr(item.content, 'proposal'): if hasattr(item.content, 'proposal'):
return item.content.title return item.content.title
else: else:
item.content_override if item.content_override else "Slot" item.content_override if item.content_override else "Slot"
def item_description(self, item): def item_description(self, item):
if hasattr(item.content, 'proposal'): if hasattr(item.content, 'proposal'):
return item.content.abstract description = "Speaker: %s\n%s" % (
item.content.speaker, item.content.abstract)
return description
else: else:
return None return None
def item_start_datetime(self, item): def item_start_datetime(self, item):
return pytz.timezone(settings.TIME_ZONE).localize(item.start_datetime) return pytz.timezone(settings.TIME_ZONE).localize(item.start_datetime)
def item_end_datetime(self, item): def item_end_datetime(self, item):
return pytz.timezone(settings.TIME_ZONE).localize(item.end_datetime) return pytz.timezone(settings.TIME_ZONE).localize(item.end_datetime)
def item_location(self, item): def item_location(self, item):
return ", ".join(room["name"] for room in item.rooms.values()) return ", ".join(room["name"] for room in item.rooms.values())
def item_link(self, item): def item_link(self, item):
if hasattr(item.content, 'proposal'): if hasattr(item.content, 'proposal'):
return 'http://%s%s' % ( return 'http://%s%s' % (