CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-04 15:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ticket cache invalidation to background task

Browse Source
This commit is contained in:
Raphael Michel
2019-04-18 09:17:01 +02:00
parent b3684377cd
commit 9ad4607d26
9 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pretix/plugins/ticketoutputpdf/forms.py
View File

@@ -1,7 +1,7 @@
from django import forms
from django.utils.translation import ugettext_lazy as _
from pretix.base.models import CachedCombinedTicket, CachedTicket
from pretix.base.services import tickets
from .models import TicketLayout, TicketLayoutItem
@@ -18,7 +18,7 @@ class TicketLayoutItemForm(forms.ModelForm):
fields = ('layout',)
def __init__(self, *args, **kwargs):
event = kwargs.pop('event')
self.event = kwargs.pop('event')
self.sales_channel = kwargs.pop('sales_channel')
super().__init__(*args, **kwargs)
if self.sales_channel.identifier != 'web':
@@ -29,7 +29,7 @@ class TicketLayoutItemForm(forms.ModelForm):
else:
self.fields['layout'].label = _('PDF ticket layout')
self.fields['layout'].empty_label = _('(Event default)')
self.fields['layout'].queryset = event.ticket_layouts.all()
self.fields['layout'].queryset = self.event.ticket_layouts.all()
self.fields['layout'].required = False
def save(self, commit=True):
@@ -41,9 +41,5 @@ class TicketLayoutItemForm(forms.ModelForm):
return
else:
return super().save(commit=commit)
CachedTicket.objects.filter(
order_position__item_id=self.instance.item, provider='pdf'
).delete()
CachedCombinedTicket.objects.filter(
order__all_positions__item=self.instance.item
).delete()
tickets.invalidate_cache.apply_async(kwargs={'event': self.event.pk, 'provider': 'pdf',
'item': self.instance.item_id})

24
src/pretix/plugins/ticketoutputpdf/views.py
View File

@@ -18,10 +18,9 @@ from django.views.generic import CreateView, DeleteView, DetailView, ListView
from reportlab.lib import pagesizes
from reportlab.pdfgen import canvas
from pretix.base.models import (
CachedCombinedTicket, CachedFile, CachedTicket, OrderPosition,
)
from pretix.base.models import CachedFile, OrderPosition
from pretix.base.pdf import Renderer
from pretix.base.services.tickets import invalidate_cache
from pretix.control.permissions import EventPermissionRequiredMixin
from pretix.control.views.pdf import BaseEditorView
from pretix.plugins.ticketoutputpdf.forms import TicketLayoutForm
@@ -40,12 +39,7 @@ class EditorView(BaseEditorView):
def save_layout(self):
super().save_layout()
CachedTicket.objects.filter(
order_position__order__event=self.request.event, provider='pdf'
).delete()
CachedCombinedTicket.objects.filter(
order__event=self.request.event, provider='pdf'
).delete()
invalidate_cache.apply_async(kwargs={'event': self.request.event.pk, 'provider': 'pdf'})
def get_layout_settings_key(self):
return 'ticketoutput_pdf_layout'
@@ -212,10 +206,7 @@ class LayoutEditorView(BaseEditorView):
self.layout.save(update_fields=['layout'])
self.layout.log_action(action='pretix.plugins.ticketoutputpdf.layout.changed', user=self.request.user,
data={'layout': self.request.POST.get("data")})
for ct in CachedTicket.objects.filter(order_position__order__event=self.request.event, provider='pdf'):
ct.delete()
for ct in CachedCombinedTicket.objects.filter(order__event=self.request.event, provider='pdf'):
ct.delete()
invalidate_cache.apply_async(kwargs={'event': self.request.event.pk, 'provider': 'pdf'})
def get_default_background(self):
return static('pretixpresale/pdf/ticket_default_a4.pdf')
@@ -251,9 +242,4 @@ class LayoutEditorView(BaseEditorView):
if self.layout.background:
self.layout.background.delete()
self.layout.background.save('background.pdf', f.file)
CachedTicket.objects.filter(
order_position__order__event=self.request.event, provider='pdf'
).delete()
CachedCombinedTicket.objects.filter(
order__event=self.request.event, provider='pdf'
).delete()
invalidate_cache.apply_async(kwargs={'event': self.request.event.pk, 'provider': 'pdf'})