From e9ea2a452e26cf1129293cf3d20cdc6ddbdfd181 Mon Sep 17 00:00:00 2001
From: Andreas Hubel <andi@saerdnaer.de>
Date: Sat, 21 Dec 2024 01:49:33 +0100
Subject: [PATCH] fix(scheduleexport): sort rooms by official_room_order
---
src/api/views/schedule.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/api/views/schedule.py b/src/api/views/schedule.py
index 31bc74718..960027181 100644
--- a/src/api/views/schedule.py
+++ b/src/api/views/schedule.py
@@ -82,7 +82,7 @@ class ConferenceSchedule(BaseScheduleView):
Event.objects.conference_accessible(conference=self.conference)
.exclude(schedule_duration=None)
.exclude(schedule_duration__lte=timedelta(minutes=5))
- .order_by(F('assembly__is_official').desc(nulls_last=True), F('room__capacity').desc(nulls_last=True), 'schedule_start')
+ .order_by(F('assembly__is_official').desc(nulls_last=True), 'room__official_room_order', F('room__capacity').desc(nulls_last=True), 'name')
)
if filter:
queryset = queryset.filter(**filter)
--
GitLab