From a3ea7310f4cb58c52266c1f166561a2ce7ae9248 Mon Sep 17 00:00:00 2001
From: Grollicus <cccvgitlab.db5c7b60@grollmann.eu>
Date: Sat, 30 Dec 2023 18:44:04 +0100
Subject: [PATCH] fixed displayed users in fahrplan
---
src/core/models/events.py | 2 +-
src/plainui/views/utils.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/models/events.py b/src/core/models/events.py
index c080fcb2c..7d7f35c55 100644
--- a/src/core/models/events.py
+++ b/src/core/models/events.py
@@ -300,7 +300,7 @@ class Event(TaggedItemMixin, BackendMixin, models.Model):
def get_all_speaker_names(self):
# plainui will prefetch speaker names in self.speakers => only do db lookup if we don't have that
try:
- names = OrderedSet(self.speakers)
+ names = OrderedSet([speaker.participant.display_name for speaker in self.speakers])
except AttributeError:
names = OrderedSet()
names |= OrderedSet(
diff --git a/src/plainui/views/utils.py b/src/plainui/views/utils.py
index 5362bec08..7296f860f 100644
--- a/src/plainui/views/utils.py
+++ b/src/plainui/views/utils.py
@@ -254,8 +254,8 @@ 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__username')
- speakers = speakers.annotate(speaker_name=F('participant__username'))
+ speakers = EventParticipant.objects.filter(is_public=True, role=EventParticipant.Role.SPEAKER).order_by('participant__display_name')
+ speakers = speakers.annotate(speaker_name=F('participant__display_name'))
return res.prefetch_related(
Prefetch('participants', queryset=speakers, to_attr='speakers'),
--
GitLab