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

Do not call task synchronously inside task (celery doesn't allow it any more)

Browse Source
This commit is contained in:
Raphael Michel
2019-04-15 15:46:37 +02:00
parent 0b65b18459
commit ec53022cc8
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,8 +123,10 @@ def get_tickets_for_order(order):
order=order, provider=p.identifier, file__isnull=False order=order, provider=p.identifier, file__isnull=False
).last() ).last()
if not ct or not ct.file: if not ct or not ct.file:
retval = generate.apply(args=('order', order.pk, p.identifier)) retval = generate_order(order.pk, p.identifier)
ct = CachedCombinedTicket.objects.get(pk=retval.get()) if not retval:
continue
ct = CachedCombinedTicket.objects.get(pk=retval)
tickets.append(( tickets.append((
"{}-{}-{}{}".format( "{}-{}-{}{}".format(
order.event.slug.upper(), order.code, ct.provider, ct.extension, order.event.slug.upper(), order.code, ct.provider, ct.extension,
@@ -140,8 +142,10 @@ def get_tickets_for_order(order):
order_position=pos, provider=p.identifier, file__isnull=False order_position=pos, provider=p.identifier, file__isnull=False
).last() ).last()
if not ct or not ct.file: if not ct or not ct.file:
retval = generate.apply(args=('orderposition', pos.pk, p.identifier)) retval = generate_orderposition(pos.pk, p.identifier)
ct = CachedTicket.objects.get(pk=retval.get()) if not retval:
continue
ct = CachedCombinedTicket.objects.get(pk=retval)
tickets.append(( tickets.append((
"{}-{}-{}-{}{}".format( "{}-{}-{}-{}{}".format(
order.event.slug.upper(), order.code, pos.positionid, ct.provider, ct.extension, order.event.slug.upper(), order.code, pos.positionid, ct.provider, ct.extension,