altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

fix: stable and correct ordering of agenda items (#4621)

Browse source 
* fix: align session sorting across functions

* fix: sessions of a group can have different types
This commit is contained in:
Robert Sparks 2022-10-21 11:04:27 -05:00 committed by GitHub
parent 5ac3874ce9
commit 3c191909ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ietf/meeting/models.py
View file

@ -1105,8 +1105,18 @@ class Session(models.Model):
from ietf.meeting.utils import add_event_info_to_session_qs
if self.group.features.has_meetings:
if not hasattr(self, "_all_meeting_sessions_for_group_cache"):
sessions = [s for s in add_event_info_to_session_qs(self.meeting.session_set.filter(group=self.group,type=self.type)) if s.official_timeslotassignment()]
self._all_meeting_sessions_for_group_cache = sorted(sessions, key = lambda x: x.official_timeslotassignment().timeslot.time)
sessions = [s for s in add_event_info_to_session_qs(self.meeting.session_set.filter(group=self.group)) if s.official_timeslotassignment()]
for s in sessions:
s.ota = s.official_timeslotassignment()
# Align this sort with SchedTimeSessAssignment default sort order since many views base their order on that
self._all_meeting_sessions_for_group_cache = sorted(
sessions, key = lambda x: (
x.ota.timeslot.time,
x.ota.timeslot.type.slug,
x.ota.session.group.parent.name if x.ota.session.group.parent else None,
x.ota.session.name
)
)
return self._all_meeting_sessions_for_group_cache
else:
return [self]