From b04171b526f6a06c032540fb7ec80081a8c559d5 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 10 May 2020 15:47:24 +0000 Subject: [PATCH] Added guards against using attributes of None in a couple of places. - Legacy-Id: 17772 --- ietf/meeting/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index d5cb61f78..45e10038b 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -601,7 +601,7 @@ def edit_meeting_schedule(request, num=None, owner=None, name=None): session_parents = sorted(set( s.group.parent for s in sessions - if s.group and s.group.parent and s.group.parent.type_id == 'area' or s.group.parent.acronym == 'irtf' + if s.group and s.group.parent and (s.group.parent.type_id == 'area' or s.group.parent.acronym == 'irtf') ), key=lambda p: p.acronym) for i, p in enumerate(session_parents): rgb_color = cubehelix(i, len(session_parents)) @@ -609,7 +609,7 @@ def edit_meeting_schedule(request, num=None, owner=None, name=None): # dig out historic AD names ad_names = {} - session_groups = set(s.group for s in sessions if s.group and s.group.parent.type_id == 'area') + session_groups = set(s.group for s in sessions if s.group and s.group.parent and s.group.parent.type_id == 'area') meeting_time = datetime.datetime.combine(meeting.date, datetime.time(0, 0, 0)) for group_id, history_time, name in Person.objects.filter(rolehistory__name='ad', rolehistory__group__group__in=session_groups, rolehistory__group__time__lte=meeting_time).values_list('rolehistory__group__group', 'rolehistory__group__time', 'name').order_by('rolehistory__group__time'):