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

Consistently use messages framework in control

Browse Source 
simplify redirect(reserve()) calls
This commit is contained in:
Raphael Michel
2015-05-22 10:01:33 +02:00
parent 10373838f1
commit 3df19a7c73
14 changed files with 116 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pretix/plugins/banktransfer/views.py
View File

@@ -125,10 +125,9 @@ class ImportView(EventPermissionRequiredMixin, TemplateView):
})
def redirect_back(self):
return redirect(reverse('plugins:banktransfer:import', kwargs={
'event': self.request.event.slug,
'organizer': self.request.event.organizer.slug,
}))
return redirect('plugins:banktransfer:import',
event=self.request.event.slug,
organizer=self.request.event.organizer.slug)
def annotate_data(self, data):
pattern = re.compile(self.request.event.slug.upper() + "([A-Z0-9]{5})")

23
src/pretix/plugins/paypal/views.py
View File

@@ -23,10 +23,9 @@ def success(request):
request.session['payment_paypal_payer'] = payer
try:
event = Event.objects.current.get(identity=request.session['payment_paypal_event'])
return redirect(reverse('presale:event.checkout.confirm', kwargs={
'event': event.slug,
'organizer': event.organizer.slug,
}))
return redirect('presale:event.checkout.confirm',
event=event.slug,
organizer=event.organizer.slug)
except Event.DoesNotExist:
pass # TODO: Handle this
else:
@@ -38,10 +37,9 @@ def abort(request):
messages.error(request, _('It looks like you cancelled the PayPal payment'))
try:
event = Event.objects.current.get(identity=request.session['payment_paypal_event'])
return redirect(reverse('presale:event.checkout.payment', kwargs={
'event': event.slug,
'organizer': event.organizer.slug,
}))
return redirect('presale:event.checkout.payment',
event=event.slug,
organizer=event.organizer.slug)
except Event.DoesNotExist:
pass # TODO: Handle this
@@ -103,8 +101,7 @@ def retry(request, order):
if resp:
return redirect(resp)
return redirect(reverse('presale:event.order', kwargs={
'event': order.event.slug,
'organizer': order.event.organizer.slug,
'order': order.code,
}))
return redirect('presale:event.order',
event=order.event.slug,
organizer=order.event.organizer.slug,
order=order.code)