From 5b5d288d4c4d60e51a7b7b5080ef9caa424d4b36 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 21 Jun 2016 19:01:55 +0000 Subject: [PATCH] Applied patch from production: Added timeslot filtering by schedule for non-session timeslot display. - Legacy-Id: 11444 --- ietf/secr/meetings/views.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ietf/secr/meetings/views.py b/ietf/secr/meetings/views.py index e61eab8ab..4c58213fb 100644 --- a/ietf/secr/meetings/views.py +++ b/ietf/secr/meetings/views.py @@ -454,8 +454,11 @@ def non_session(request, meeting_id, schedule_name): check_nonsession(meeting,schedule) - slots = TimeSlot.objects.filter(meeting=meeting,type__in=('break','reg','other','plenary','lead')).order_by('-type__name','time') - + slots = TimeSlot.objects.filter(meeting=meeting) + slots = slots.filter(sessionassignments__schedule=schedule) + slots = slots.filter(type__in=('break','reg','other','plenary','lead')) + slots = slots.order_by('-type__name','time') + if request.method == 'POST': form = NonSessionForm(request.POST) if form.is_valid():