From d59af2aa0fee35d82fd41a4d459b2eb6529b7ac1 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 15 Apr 2015 12:58:44 +0000 Subject: [PATCH] Adapt session_draft_list() code to handle the case when there is multiple agendas for a given group acronym. Fixes some server 500 results when trying to get pdf bundles for the plenary sessions for ietf 71. - Legacy-Id: 9502 --- ietf/meeting/views.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 5bd14c8a6..fd4de3a45 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -467,17 +467,18 @@ def convert_to_pdf(doc_name): def session_draft_list(num, session): try: - agenda = Document.objects.filter(type="agenda", + agendas = Document.objects.filter(type="agenda", session__meeting__number=num, session__group__acronym=session, - states=State.objects.get(type="agenda", slug="active")).distinct().get() + states=State.objects.get(type="agenda", slug="active")).distinct() except Document.DoesNotExist: raise Http404 drafts = set() - content = read_agenda_file(num, agenda) - if content: - drafts.update(re.findall('(draft-[-a-z0-9]*)', content)) + for agenda in agendas: + content = read_agenda_file(num, agenda) + if content: + drafts.update(re.findall('(draft-[-a-z0-9]*)', content)) result = [] for draft in drafts: