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

Revert "Typeahead: No substring match in admin sessions"

Browse Source 
This reverts commit 2626259492.
This commit is contained in:
Raphael Michel
2020-07-24 15:28:14 +02:00
parent 0a97b0ce67
commit 1cfec9cc99
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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