fix transport filtering
This commit is contained in:
parent
802e1a36a3
commit
42d00191fd
|
@ -238,14 +238,15 @@ def talk_decide(request, talk, accepted):
|
||||||
def speaker_list(request):
|
def speaker_list(request):
|
||||||
show_filters = False
|
show_filters = False
|
||||||
site = get_current_site(request)
|
site = get_current_site(request)
|
||||||
speakers = Participation.objects.filter(user__talk__in=Talk.objects.filter(site=site)).all().distinct()
|
talks = Talk.objects.filter(site=site)
|
||||||
|
speakers = Participation.objects.filter(user__talk__in=talks).all().distinct()
|
||||||
filter_form = SpeakerFilterForm(request.GET or None)
|
filter_form = SpeakerFilterForm(request.GET or None)
|
||||||
# Filtering
|
# Filtering
|
||||||
if filter_form.is_valid():
|
if filter_form.is_valid():
|
||||||
data = filter_form.cleaned_data
|
data = filter_form.cleaned_data
|
||||||
if len(data['transport']):
|
if len(data['transport']):
|
||||||
show_filters = True
|
show_filters = True
|
||||||
speakers = speakers.filter(reduce(lambda x, y: x | y, [Q(transport__pk=pk) for pk in data['transport']]))
|
speakers = speakers.filter(need_transport=True).filter(reduce(lambda x, y: x | y, [Q(transport__pk=pk) for pk in data['transport']]))
|
||||||
if len(data['hosting']):
|
if len(data['hosting']):
|
||||||
show_filters = True
|
show_filters = True
|
||||||
queries = []
|
queries = []
|
||||||
|
|
Loading…
Reference in New Issue
Block a user