From da33298be517f6eba9e6538eb43a7504b4e7f5e9 Mon Sep 17 00:00:00 2001 From: Brian Costlow Date: Fri, 3 May 2019 15:11:26 -0400 Subject: [PATCH] Ordering fix. --- pycon/schedule/views.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pycon/schedule/views.py b/pycon/schedule/views.py index 9ec92210..044ed771 100644 --- a/pycon/schedule/views.py +++ b/pycon/schedule/views.py @@ -7,6 +7,8 @@ from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.models import User +from django.db.models import Max + from .models import Session, SessionRole, Presentation, SlidesUpload from .forms import SlidesUploadForm @@ -184,12 +186,13 @@ def slides_upload(request, presentation_id): @login_required @permission_required('pycon_schedule.can_download_slides', raise_exception=True) def slides_download(request): - """Build the slides download page for the captioners.""" - available_slides = SlidesUpload.objects.order_by( - 'presentation__slot__start', + """Build the slides download page for the captioners.""" + available_slides = SlidesUpload.objects.annotate(room=Max('presentation__slot__slotroom__room__name')).order_by( 'presentation__slot__day__date', - ) + 'room', + 'presentation__slot__start' + ) # Django ORM does ordering but not grouping, so build the nested display # order the hard way.