Run event_view on org-level plugin views

This commit is contained in:
Raphael Michel
2023-05-11 14:28:44 +02:00
parent 89fe3d5bd2
commit 6ae5eecf27
3 changed files with 5 additions and 4 deletions

View File

@@ -66,7 +66,7 @@ for app in apps.get_app_configs():
single_plugin_patterns.append(re_path(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', single_plugin_patterns.append(re_path(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/',
include(patterns))) include(patterns)))
if hasattr(urlmod, 'organizer_patterns'): if hasattr(urlmod, 'organizer_patterns'):
patterns = urlmod.organizer_patterns patterns = plugin_event_urls(urlmod.organizer_patterns, plugin=app.name)
single_plugin_patterns.append(re_path(r'^(?P<organizer>[^/]+)/', single_plugin_patterns.append(re_path(r'^(?P<organizer>[^/]+)/',
include(patterns))) include(patterns)))
raw_plugin_patterns.append( raw_plugin_patterns.append(

View File

@@ -49,7 +49,7 @@ for app in apps.get_app_configs():
re_path(r'^(?P<event>[^/]+)/', include((patterns, app.label))) re_path(r'^(?P<event>[^/]+)/', include((patterns, app.label)))
) )
if hasattr(urlmod, 'organizer_patterns'): if hasattr(urlmod, 'organizer_patterns'):
patterns = urlmod.organizer_patterns patterns = plugin_event_urls(urlmod.organizer_patterns, plugin=app.name)
raw_plugin_patterns.append( raw_plugin_patterns.append(
re_path(r'', include((patterns, app.label))) re_path(r'', include((patterns, app.label)))
) )

View File

@@ -389,8 +389,9 @@ def _event_view(function=None, require_live=True, require_plugin=None):
else: else:
with scope(organizer=getattr(request, 'organizer', None)): with scope(organizer=getattr(request, 'organizer', None)):
response = func(request=request, *args, **kwargs) response = func(request=request, *args, **kwargs)
for receiver, r in process_response.send(request.event, request=request, response=response): if getattr(request, 'event', None):
response = r for receiver, r in process_response.send(request.event, request=request, response=response):
response = r
if isinstance(response, TemplateResponse): if isinstance(response, TemplateResponse):
response = response.render() response = response.render()