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

fix: Handle proceedings for "notmeet" sessions correctly (#5065)

Browse source
This commit is contained in:
Jennifer Richards 2023-02-01 12:47:37 -04:00 committed by GitHub
parent 7ddc09ef25
commit 760a01ad91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ietf/meeting/views.py
View file

@ -3621,7 +3621,8 @@ def organize_proceedings_sessions(sessions):
""" """
material_times = {} # key is material, value is first timestamp it appeared material_times = {} # key is material, value is first timestamp it appeared
for s, mats in items: for s, mats in items:
timestamp = s.official_timeslotassignment().timeslot.time tsa = s.official_timeslotassignment()
timestamp = tsa.timeslot.time if tsa else None
if not isinstance(mats, list): if not isinstance(mats, list):
mats = [mats] mats = [mats]
for mat in mats: for mat in mats:
@ -3640,7 +3641,7 @@ def organize_proceedings_sessions(sessions):
'group': group, 'group': group,
'name': sess_name, 'name': sess_name,
'canceled': all_canceled, 'canceled': all_canceled,
# pass sessions instead of the materials here so session data (like time) is easily available 'has_materials': s.sessionpresentation_set.exists(),
'agendas': _format_materials((s, s.agenda()) for s in ss), 'agendas': _format_materials((s, s.agenda()) for s in ss),
'minutes': _format_materials((s, s.minutes()) for s in ss), 'minutes': _format_materials((s, s.minutes()) for s in ss),
'bluesheets': _format_materials((s, s.bluesheets()) for s in ss), 'bluesheets': _format_materials((s, s.bluesheets()) for s in ss),

2
ietf/templates/meeting/proceedings.html
View file

@ -88,7 +88,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for entry in not_meeting_groups %}{% if entry.sessions_with_materials %} {% for entry in not_meeting_groups %}{% if entry.has_materials %}
{% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %} {% include "meeting/group_proceedings.html" with entry=entry meeting=meeting show_agenda=True only %}
{% endif %}{% endfor %} {% endif %}{% endfor %}
</tbody> </tbody>