Skip to content

Ordering fix. #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ordering fix. #691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pycon/schedule/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down