CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix iCal test failing due to new UID format

Browse Source
This commit is contained in:
Raphael Michel
2017-07-14 14:55:08 +02:00
parent f94314afec
commit 8438b211a6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pretix/presale/ical.py
View File

@@ -19,6 +19,12 @@ def get_ical(events):
for ev in events:
event = ev if isinstance(ev, Event) else ev.event
tz = pytz.timezone(event.settings.timezone)
if isinstance(ev, Event):
url = build_absolute_uri(event, 'presale:event.index')
else:
url = build_absolute_uri(event, 'presale:event.index', {
'subevent': ev.pk
})
vevent = cal.add('vevent')
vevent.add('summary').value = str(ev.name)
@@ -29,7 +35,7 @@ def get_ical(events):
vevent.add('uid').value = 'pretix-{}-{}-{}@{}'.format(
event.organizer.slug, event.slug,
ev.pk if not isinstance(ev, Event) else '0',
urlparse(settings.SITE_URL).netloc
urlparse(url).netloc
)
if event.settings.show_times:
@@ -44,13 +50,7 @@ def get_ical(events):
vevent.add('dtend').value = ev.date_to.astimezone(tz).date()
descr = []
if isinstance(ev, Event):
descr.append(_('Tickets: {url}').format(url=build_absolute_uri(event, 'presale:event.index')))
else:
descr.append(_('Tickets: {url}').format(url=build_absolute_uri(event, 'presale:event.index', {
'subevent': ev.pk
})))
descr.append(_('Tickets: {url}').format(url=url))
if ev.date_admission:
descr.append(str(_('Admission: {datetime}')).format(