From d17564d695dc8be58bafb31db4944bc84eebe1e7 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Wed, 24 Feb 2016 22:18:38 +0000 Subject: [PATCH] Preserve the assumptions in the secr/proceedings code by isolating it from drafts now appearing in sessionpresentations. Commit ready for merge. - Legacy-Id: 10857 --- ietf/secr/proceedings/views.py | 4 +++- ietf/secr/utils/meeting.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index bf9090a33..aacfec18f 100644 --- a/ietf/secr/proceedings/views.py +++ b/ietf/secr/proceedings/views.py @@ -997,7 +997,9 @@ def upload_unified(request, meeting_num, acronym=None, session_id=None): # gather DocEvents # include deleted material to catch deleted doc events - docs = session.materials.all() + #docs = session.materials.all() + # Don't report on draft DocEvents since the secr/materials app isn't managing them + docs = session.materials.exclude(type='draft') docevents = DocEvent.objects.filter(doc__in=docs) path = get_proceedings_path(meeting,group) diff --git a/ietf/secr/utils/meeting.py b/ietf/secr/utils/meeting.py index 2d95964be..6873e7028 100644 --- a/ietf/secr/utils/meeting.py +++ b/ietf/secr/utils/meeting.py @@ -20,6 +20,9 @@ def get_materials(group,meeting): for doc in session.materials.exclude(states__slug='deleted').order_by('order'): if doc.type.slug in ('minutes','agenda'): materials[doc.type.slug] = doc + elif doc.type.slug == 'draft': + continue + # drafts are currently managed directly by the session and document views elif doc not in materials[doc.type.slug]: materials[doc.type.slug].append(doc) return materials