mirror of
https://github.com/pretix/pretix.git
synced 2026-05-05 15:14:04 +00:00
Fixed duplicate execution of process_response
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
from django.conf import settings
|
||||
from django.core.files.storage import default_storage
|
||||
from django.core.urlresolvers import Resolver404, resolve
|
||||
|
||||
from .signals import footer_link, html_head
|
||||
|
||||
@@ -9,11 +8,7 @@ def contextprocessor(request):
|
||||
"""
|
||||
Adds data to all template contexts
|
||||
"""
|
||||
try:
|
||||
url = resolve(request.path_info)
|
||||
except Resolver404:
|
||||
return {}
|
||||
if url.namespace != 'presale':
|
||||
if request.path.startswith('/control'):
|
||||
return {}
|
||||
|
||||
ctx = {
|
||||
@@ -30,6 +25,7 @@ def contextprocessor(request):
|
||||
if request.event.settings.presale_css_file:
|
||||
ctx['css_file'] = default_storage.url(request.event.settings.presale_css_file)
|
||||
ctx['event_logo'] = request.event.settings.get('logo_image', as_type=str, default='')[7:]
|
||||
ctx['event'] = request.event
|
||||
|
||||
ctx['html_head'] = "".join(_html_head)
|
||||
ctx['footer'] = _footer
|
||||
|
||||
@@ -8,8 +8,7 @@ from .utils import _detect_event
|
||||
class EventMiddleware:
|
||||
def process_request(self, request):
|
||||
url = resolve(request.path_info)
|
||||
url_namespace = url.namespace
|
||||
if url_namespace != 'presale':
|
||||
if url.namespace != 'presale':
|
||||
return
|
||||
|
||||
if 'organizer' in url.kwargs or 'event' in url.kwargs:
|
||||
@@ -23,7 +22,8 @@ class EventMiddleware:
|
||||
request.session['_'] = '_'
|
||||
|
||||
def process_response(self, request, response):
|
||||
if hasattr(request, 'event'):
|
||||
url = resolve(request.path_info)
|
||||
if url.namespace == 'presale' and hasattr(request, 'event'):
|
||||
for receiver, r in process_response.send(request.event, request=request, response=response):
|
||||
response = r
|
||||
return response
|
||||
|
||||
Reference in New Issue
Block a user