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

Fix a PDF generation loop

Browse Source
This commit is contained in:
Raphael Michel
2016-12-23 13:44:11 +01:00
parent 62ef5271de
commit c5ec918e78
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/base/services/tickets.py
View File

@@ -19,9 +19,11 @@ def generate(order_position: str, provider: str):
ct = CachedTicket.objects.get(order_position=order_position, provider=provider)
except CachedTicket.MultipleObjectsReturned:
CachedTicket.objects.filter(order_position=order_position, provider=provider).delete()
ct = CachedTicket(order_position=order_position, provider=provider)
ct = CachedTicket.objects.create(order_position=order_position, provider=provider, extension='',
type='', file=None)
except CachedTicket.DoesNotExist:
ct = CachedTicket(order_position=order_position, provider=provider)
ct = CachedTicket.objects.create(order_position=order_position, provider=provider, extension='',
type='', file=None)
with language(order_position.order.locale):
responses = register_ticket_outputs.send(order_position.order.event)

6
src/pretix/presale/views/order.py
View File

@@ -534,11 +534,13 @@ class OrderDownload(EventViewMixin, OrderDetailMixin, View):
if 'ajax' in request.GET:
return HttpResponse('1' if ct and ct.file else '0')
elif not ct or not ct.file:
elif not ct:
generate.apply_async(args=(self.order_position.id, self.output.identifier))
return render(request, "pretixbase/cachedfiles/pending.html", {})
elif not ct.file:
return render(request, "pretixbase/cachedfiles/pending.html", {})
else:
resp = FileResponse(ct.file.file, content_type='application/pdf')
resp = FileResponse(ct.file.file, content_type=ct.type)
resp['Content-Disposition'] = 'attachment; filename="{}-{}-{}-{}{}"'.format(
self.request.event.slug.upper(), self.order.code, self.order_position.positionid,
self.output.identifier, ct.extension