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

Fix another multidomain issue

Browse Source
This commit is contained in:
Raphael Michel
2020-06-04 20:15:26 +02:00
parent ce896cec8f
commit a57280004e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/multidomain/middlewares.py
View File

@@ -13,6 +13,7 @@ from django.urls import set_urlconf
from django.utils.cache import patch_vary_headers from django.utils.cache import patch_vary_headers
from django.utils.deprecation import MiddlewareMixin from django.utils.deprecation import MiddlewareMixin
from django.utils.http import http_date from django.utils.http import http_date
from django_scopes import scopes_disabled
from pretix.base.models import Event, Organizer from pretix.base.models import Event, Organizer
from pretix.helpers.cookies import set_cookie_without_samesite from pretix.helpers.cookies import set_cookie_without_samesite
@@ -62,8 +63,13 @@ class MultiDomainMiddleware(MiddlewareMixin):
if event: if event:
request.event_domain = True request.event_domain = True
request.organizer = orga if isinstance(orga, Organizer) else Organizer.objects.get(pk=orga) if isinstance(event, Event):
request.event = event if isinstance(event, Event) else request.organizer.events.get(pk=event) request.organizer = orga
request.event = event
else:
with scopes_disabled():
request.event = request.organizer.events.select_related('organizer').get(pk=event)
request.organizer = request.event.organizer
request.urlconf = "pretix.multidomain.event_domain_urlconf" request.urlconf = "pretix.multidomain.event_domain_urlconf"
elif orga: elif orga:
request.organizer_domain = True request.organizer_domain = True