Skip to content

Commit

Permalink
Preserve the assumptions in the secr/proceedings code by isolating it…
Browse files Browse the repository at this point in the history
… from drafts now appearing in sessionpresentations. Commit ready for merge.

 - Legacy-Id: 10857
  • Loading branch information
rjsparks committed Feb 24, 2016
1 parent e8d40c8 commit d17564d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 3 additions & 1 deletion ietf/secr/proceedings/views.py
Expand Up @@ -997,7 +997,9 @@ def redirection_back(meeting, group):

# 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)
Expand Down
3 changes: 3 additions & 0 deletions ietf/secr/utils/meeting.py
Expand Up @@ -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
Expand Down

0 comments on commit d17564d

Please sign in to comment.