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

Team list: Rewrite search query

Browse Source
This commit is contained in:
Raphael Michel
2021-06-29 18:05:51 +02:00
parent 2f1dd79162
commit 3fab15d086
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/pretix/control/forms/filter.py
View File

@@ -57,7 +57,8 @@ from pretix.base.forms.widgets import (
from pretix.base.models import ( from pretix.base.models import (
Checkin, CheckinList, Device, Event, EventMetaProperty, EventMetaValue, Checkin, CheckinList, Device, Event, EventMetaProperty, EventMetaValue,
Gate, Invoice, InvoiceAddress, Item, Order, OrderPayment, OrderPosition, Gate, Invoice, InvoiceAddress, Item, Order, OrderPayment, OrderPosition,
OrderRefund, Organizer, Question, QuestionAnswer, SubEvent, OrderRefund, Organizer, Question, QuestionAnswer, SubEvent, Team,
TeamAPIToken, TeamInvite,
) )
from pretix.base.signals import register_payment_providers from pretix.base.signals import register_payment_providers
from pretix.control.forms.widgets import Select2 from pretix.control.forms.widgets import Select2
@@ -1130,11 +1131,25 @@ class TeamFilterForm(FilterForm):
if fdata.get('query'): if fdata.get('query'):
query = fdata.get('query') query = fdata.get('query')
qs = qs.filter( qs = qs.filter(
Q(name__icontains=query) Q(Exists(
| Q(members__email__icontains=query) Team.members.through.objects.filter(
| Q(members__fullname__icontains=query) Q(user__email__icontains=query) | Q(user__fullname__icontains=query),
| Q(invites__email__icontains=query) team_id=OuterRef('pk'),
| Q(tokens__name__icontains=query) )
))
| Q(Exists(
TeamInvite.objects.filter(
email__icontains=query,
team_id=OuterRef('pk'),
)
))
| Q(Exists(
TeamAPIToken.objects.filter(
name__icontains=query,
team_id=OuterRef('pk'),
)
))
| Q(name__icontains=query)
) )
if fdata.get('ordering'): if fdata.get('ordering'):