From 85f12e40116fbf547354ec3e334e5f479aedc0f6 Mon Sep 17 00:00:00 2001
From: Andreas Hubel <andi@saerdnaer.de>
Date: Sat, 21 Dec 2024 01:54:25 +0100
Subject: [PATCH] chore(schedule): use new EventParticipant order column
---
src/core/models/events.py | 2 +-
src/plainui/views/utils.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/models/events.py b/src/core/models/events.py
index 19ea075f7..9908758a1 100644
--- a/src/core/models/events.py
+++ b/src/core/models/events.py
@@ -296,7 +296,7 @@ class Event(TaggedItemMixin, BackendMixin, ActivityLogMixin, models.Model):
names = OrderedSet()
names |= OrderedSet(
self.participants.filter(is_public=True, role=EventParticipant.Role.SPEAKER)
- .order_by('participant__display_name')
+ .order_by('order', 'participant__display_name')
.values_list('participant__display_name', flat=True)
)
diff --git a/src/plainui/views/utils.py b/src/plainui/views/utils.py
index b38eaaf0f..df4f9decf 100644
--- a/src/plainui/views/utils.py
+++ b/src/plainui/views/utils.py
@@ -259,7 +259,7 @@ def event_filter(
res = res.exclude(recording=Event.Recording.UNKNOWN, room__isnull=False, room__recording_state__in=[Room.RecordingState.RECORD_BY_DEFAULT])
res = res.annotate(track_name=F('track__name'))
- speakers = EventParticipant.objects.filter(is_public=True, role=EventParticipant.Role.SPEAKER).order_by('participant__display_name')
+ speakers = EventParticipant.objects.filter(is_public=True, role=EventParticipant.Role.SPEAKER).order_by('order', 'participant__display_name')
speakers = speakers.annotate(speaker_name=F('participant__display_name'))
return res.prefetch_related(
--
GitLab