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

AsyncFormView: Pass locale and timezone to task

Browse Source
This commit is contained in:
Raphael Michel
2021-04-20 19:04:29 +02:00
parent b482d84c3c
commit 7942c4112f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/base/views/tasks.py
View File

@@ -22,6 +22,7 @@
import logging import logging
import celery.exceptions import celery.exceptions
import pytz
from celery.result import AsyncResult from celery.result import AsyncResult
from django.conf import settings from django.conf import settings
from django.contrib import messages from django.contrib import messages
@@ -29,7 +30,9 @@ from django.core.exceptions import ValidationError
from django.http import JsonResponse from django.http import JsonResponse
from django.shortcuts import redirect, render from django.shortcuts import redirect, render
from django.test import RequestFactory from django.test import RequestFactory
from django.utils.translation import gettext as _ from django.utils import timezone, translation
from django.utils.timezone import get_current_timezone
from django.utils.translation import get_language, gettext as _
from django.views.generic import FormView from django.views.generic import FormView
from pretix.base.models import User from pretix.base.models import User
@@ -201,7 +204,7 @@ class AsyncFormView(AsyncMixin, FormView):
known_errortypes = ['ValidationError'] known_errortypes = ['ValidationError']
def __init_subclass__(cls): def __init_subclass__(cls):
def async_execute(self, request_path, form_kwargs, organizer=None, event=None, user=None): def async_execute(self, *, request_path, form_kwargs, locale, tz, organizer=None, event=None, user=None):
view_instance = cls() view_instance = cls()
view_instance.request = RequestFactory().post(request_path) view_instance.request = RequestFactory().post(request_path)
if organizer: if organizer:
@@ -218,7 +221,8 @@ class AsyncFormView(AsyncMixin, FormView):
form_kwargs = view_instance.get_async_form_kwargs(form_kwargs, organizer, event) form_kwargs = view_instance.get_async_form_kwargs(form_kwargs, organizer, event)
form = form_class(**form_kwargs) form = form_class(**form_kwargs)
return view_instance.async_form_valid(self, form) with translation.override(locale), timezone.override(pytz.timezone(tz)):
return view_instance.async_form_valid(self, form)
cls.async_execute = app.task( cls.async_execute = app.task(
base=ProfiledEventTask, base=ProfiledEventTask,
@@ -253,6 +257,8 @@ class AsyncFormView(AsyncMixin, FormView):
kwargs = { kwargs = {
'request_path': self.request.path, 'request_path': self.request.path,
'form_kwargs': form_kwargs, 'form_kwargs': form_kwargs,
'locale': get_language(),
'tz': get_current_timezone().zone,
} }
if hasattr(self.request, 'organizer'): if hasattr(self.request, 'organizer'):
kwargs['organizer'] = self.request.organizer.pk kwargs['organizer'] = self.request.organizer.pk