mirror of
https://github.com/pretix/pretix.git
synced 2026-05-09 15:54:03 +00:00
Localize date-based subevent search
This commit is contained in:
@@ -7,6 +7,7 @@ from django.db.models import Max, Min, Q
|
|||||||
from django.db.models.functions import Coalesce, Greatest
|
from django.db.models.functions import Coalesce, Greatest
|
||||||
from django.http import JsonResponse
|
from django.http import JsonResponse
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
from django.utils.formats import get_format
|
||||||
from django.utils.timezone import make_aware
|
from django.utils.timezone import make_aware
|
||||||
from django.utils.translation import pgettext, ugettext as _
|
from django.utils.translation import pgettext, ugettext as _
|
||||||
|
|
||||||
@@ -84,15 +85,18 @@ def subevent_select2(request, **kwargs):
|
|||||||
qf = Q(name__icontains=i18ncomp(query)) | Q(location__icontains=query)
|
qf = Q(name__icontains=i18ncomp(query)) | Q(location__icontains=query)
|
||||||
tz = request.event.timezone
|
tz = request.event.timezone
|
||||||
|
|
||||||
try:
|
dt = None
|
||||||
dt = parse(query)
|
for f in get_format('DATE_INPUT_FORMATS'):
|
||||||
except ValueError:
|
try:
|
||||||
pass
|
dt = datetime.strptime(query, f)
|
||||||
else:
|
break
|
||||||
if dt:
|
except (ValueError, TypeError):
|
||||||
dt_start = make_aware(datetime.combine(dt.date(), time(hour=0, minute=0, second=0)), tz)
|
continue
|
||||||
dt_end = make_aware(datetime.combine(dt.date(), time(hour=23, minute=59, second=59)), tz)
|
|
||||||
qf |= Q(date_from__gte=dt_start) & Q(date_from__lte=dt_end)
|
if dt:
|
||||||
|
dt_start = make_aware(datetime.combine(dt.date(), time(hour=0, minute=0, second=0)), tz)
|
||||||
|
dt_end = make_aware(datetime.combine(dt.date(), time(hour=23, minute=59, second=59)), tz)
|
||||||
|
qf |= Q(date_from__gte=dt_start) & Q(date_from__lte=dt_end)
|
||||||
|
|
||||||
qs = request.event.subevents.filter(
|
qs = request.event.subevents.filter(
|
||||||
qf
|
qf
|
||||||
|
|||||||
Reference in New Issue
Block a user