From a0f548ea6bb7ed243075d14249e0450cac2cfa1c Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Tue, 19 Feb 2013 18:21:55 +0000 Subject: [PATCH] fix issues with processing converted meeting materials - Legacy-Id: 5436 --- ietf/secr/proceedings/views.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index 30f4b274a..5a95f6921 100644 --- a/ietf/secr/proceedings/views.py +++ b/ietf/secr/proceedings/views.py @@ -544,8 +544,9 @@ def process_pdfs(request, meeting_num): ''' warn_count = 0 count = 0 - ppt = Document.objects.filter(session__meeting=meeting_num,type='slides',external_url__endswith='.ppt').exclude(states__slug='deleted') - pptx = Document.objects.filter(session__meeting=meeting_num,type='slides',external_url__endswith='.pptx').exclude(states__slug='deleted') + meeting = get_object_or_404(Meeting, number=meeting_num) + ppt = Document.objects.filter(session__meeting=meeting,type='slides',external_url__endswith='.ppt').exclude(states__slug='deleted') + pptx = Document.objects.filter(session__meeting=meeting,type='slides',external_url__endswith='.pptx').exclude(states__slug='deleted') for doc in itertools.chain(ppt,pptx): base,ext = os.path.splitext(doc.external_url) pdf_file = base + '.pdf' @@ -693,8 +694,8 @@ def select(request, meeting_num): # count PowerPoint files waiting to be converted if has_role(user,'Secretariat'): - ppt = Document.objects.filter(session__meeting=meeting_num,type='slides',external_url__endswith='.ppt').exclude(states__slug='deleted') - pptx = Document.objects.filter(session__meeting=meeting_num,type='slides',external_url__endswith='.pptx').exclude(states__slug='deleted') + ppt = Document.objects.filter(session__meeting=meeting,type='slides',external_url__endswith='.ppt').exclude(states__slug='deleted') + pptx = Document.objects.filter(session__meeting=meeting,type='slides',external_url__endswith='.pptx').exclude(states__slug='deleted') ppt_count = ppt.count() + pptx.count() else: ppt_count = 0