From 129cccb88f00bf3ca69d6d8b86ddc3e3b250cc59 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Wed, 26 Aug 2015 07:52:05 +0000 Subject: [PATCH] Summary: Fixed problem with timeslot.location = None in agenda_csv. Commit ready for merge. - Legacy-Id: 10062 --- ietf/meeting/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 2813e20aa..9a7023e34 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -457,7 +457,7 @@ def agenda_csv(schedule, filtered_assignments): row.append("r{}".format(item.timeslot.pk)) elif item.timeslot.type_id == "other": row.append("None") - row.append(item.timeslot.location.name) + row.append(item.timeslot.location.name if item.timeslot.location else "") row.append("") row.append(item.session.historic_group.acronym) row.append(item.session.historic_group.historic_parent.acronym.upper() if item.session.historic_group.historic_parent else "") @@ -465,7 +465,7 @@ def agenda_csv(schedule, filtered_assignments): row.append(item.session.pk) elif item.timeslot.type_id == "plenary": row.append(item.session.name) - row.append(item.timeslot.location.name) + row.append(item.timeslot.location.name if item.timeslot.location else "") row.append("") row.append(item.session.historic_group.acronym if item.session.historic_group else "") row.append("") @@ -475,7 +475,7 @@ def agenda_csv(schedule, filtered_assignments): row.append(slides_field(item)) elif item.timeslot.type_id == "session": row.append(item.timeslot.name) - row.append(item.timeslot.location.name) + row.append(item.timeslot.location.name if item.timeslot.location else "") row.append(item.session.historic_group.historic_parent.acronym.upper() if item.session.historic_group.historic_parent else "") row.append(item.session.historic_group.acronym if item.session.historic_group else "") row.append("BOF" if item.session.historic_group.state_id in ("bof", "bof-conc") else item.session.historic_group.type.name)