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

Fixed duplicate execution of process_response

Browse Source
This commit is contained in:
Raphael Michel
2016-09-26 15:12:05 +02:00
parent 68987970bf
commit ba32298602
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/presale/context.py
View File

@@ -1,6 +1,5 @@
from django.conf import settings from django.conf import settings
from django.core.files.storage import default_storage from django.core.files.storage import default_storage
from django.core.urlresolvers import Resolver404, resolve
from .signals import footer_link, html_head from .signals import footer_link, html_head
@@ -9,11 +8,7 @@ def contextprocessor(request):
""" """
Adds data to all template contexts Adds data to all template contexts
""" """
try: if request.path.startswith('/control'):
url = resolve(request.path_info)
except Resolver404:
return {}
if url.namespace != 'presale':
return {} return {}
ctx = { ctx = {
@@ -30,6 +25,7 @@ def contextprocessor(request):
if request.event.settings.presale_css_file: if request.event.settings.presale_css_file:
ctx['css_file'] = default_storage.url(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_logo'] = request.event.settings.get('logo_image', as_type=str, default='')[7:]
ctx['event'] = request.event
ctx['html_head'] = "".join(_html_head) ctx['html_head'] = "".join(_html_head)
ctx['footer'] = _footer ctx['footer'] = _footer

6
src/pretix/presale/middleware.py
View File

@@ -8,8 +8,7 @@ from .utils import _detect_event
class EventMiddleware: class EventMiddleware:
def process_request(self, request): def process_request(self, request):
url = resolve(request.path_info) url = resolve(request.path_info)
url_namespace = url.namespace if url.namespace != 'presale':
if url_namespace != 'presale':
return return
if 'organizer' in url.kwargs or 'event' in url.kwargs: if 'organizer' in url.kwargs or 'event' in url.kwargs:
@@ -23,7 +22,8 @@ class EventMiddleware:
request.session['_'] = '_' request.session['_'] = '_'
def process_response(self, request, response): 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): for receiver, r in process_response.send(request.event, request=request, response=response):
response = r response = r
return response return response