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

Localize date-based subevent search

Browse Source
This commit is contained in:
Raphael Michel
2018-04-16 17:19:17 +02:00
parent 31f2cc1fdc
commit 7611188535
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/control/views/typeahead.py
View File

@@ -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,11 +85,14 @@ 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
dt = None
for f in get_format('DATE_INPUT_FORMATS'):
try: try:
dt = parse(query) dt = datetime.strptime(query, f)
except ValueError: break
pass except (ValueError, TypeError):
else: continue
if dt: if dt:
dt_start = make_aware(datetime.combine(dt.date(), time(hour=0, minute=0, second=0)), tz) 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) dt_end = make_aware(datetime.combine(dt.date(), time(hour=23, minute=59, second=59)), tz)