Skip to content

Commit

Permalink
fix: use area-acronym-at-the-time in proceedings (#7723)
Browse files Browse the repository at this point in the history
When generating IETF meeting proceedings, use the Area Acronym for each WG at the time of the meeting. Fixes #7706.
  • Loading branch information
russhousley committed Aug 5, 2024
1 parent 16ac73d commit 63d1307
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions ietf/meeting/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4131,6 +4131,13 @@ def _format_materials(items):

def proceedings(request, num=None):

def area_and_group_acronyms_from_session(s):
area = s.group_parent_at_the_time()
if area == None:
area = s.group.parent
group = s.group_at_the_time()
return (area.acronym, group.acronym)

meeting = get_meeting(num)

# Early proceedings were hosted on www.ietf.org rather than the datatracker
Expand Down Expand Up @@ -4181,12 +4188,11 @@ def proceedings(request, num=None):
.exclude(current_status='notmeet')
)

ietf = sessions.filter(group__parent__type__slug = 'area').exclude(group__acronym='edu').order_by('group__parent__acronym', 'group__acronym')
ietf = sessions.filter(group__parent__type__slug = 'area').exclude(group__acronym__in=['edu','iepg','tools'])
ietf = list(ietf)
ietf.sort(key=lambda s: area_and_group_acronyms_from_session(s))
ietf_areas = []
for area, area_sessions in itertools.groupby(
ietf,
key=lambda s: s.group.parent
):
for area, area_sessions in itertools.groupby(ietf, key=lambda s: s.group_parent_at_the_time()):
meeting_groups, not_meeting_groups = organize_proceedings_sessions(area_sessions)
ietf_areas.append((area, meeting_groups, not_meeting_groups))

Expand Down

0 comments on commit 63d1307

Please sign in to comment.