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

Typeahead: No substring match in admin sessions

Browse Source
This commit is contained in:
Raphael Michel
2020-07-23 18:20:41 +02:00
parent 18415c62bb
commit 2626259492
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,23 +163,27 @@ def nav_context_list(request):
qs_orga = qs_orga.filter(Q(name__icontains=query) | Q(slug__icontains=query))
if query:
qs_orders = Order.objects.filter(code__icontains=query).select_related('event', 'event__organizer')
qs_orders = Order.objects.select_related('event', 'event__organizer')
if not request.user.has_active_staff_session(request.session.session_key):
qs_orders = qs_orders.filter(
Q(event__organizer_id__in=request.user.teams.filter(
all_events=True, can_view_orders=True).values_list('organizer', flat=True))
| Q(event_id__in=request.user.teams.filter(
can_view_orders=True).values_list('limit_events__id', flat=True))
)
).filter(code__icontains=query)
else:
qs_orders = qs_orders.filter(code__iexact=query)
qs_vouchers = Voucher.objects.filter(code__icontains=query).select_related('event', 'event__organizer')
qs_vouchers = Voucher.objects.select_related('event', 'event__organizer')
if not request.user.has_active_staff_session(request.session.session_key):
qs_vouchers = qs_vouchers.filter(
Q(event__organizer_id__in=request.user.teams.filter(
all_events=True, can_view_vouchers=True).values_list('organizer', flat=True))
| Q(event_id__in=request.user.teams.filter(
can_view_vouchers=True).values_list('limit_events__id', flat=True))
)
).filter(code__icontains=query)
else:
qs_vouchers = qs_vouchers.filter(code__iexact=query)
else:
qs_vouchers = Voucher.objects.none()
qs_orders = Order.objects.none()