Skip to content

Commit d17564d

Browse files
committed
Preserve the assumptions in the secr/proceedings code by isolating it from drafts now appearing in sessionpresentations. Commit ready for merge.
- Legacy-Id: 10857
1 parent e8d40c8 commit d17564d

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

ietf/secr/proceedings/views.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,9 @@ def redirection_back(meeting, group):
997997

998998
# gather DocEvents
999999
# include deleted material to catch deleted doc events
1000-
docs = session.materials.all()
1000+
#docs = session.materials.all()
1001+
# Don't report on draft DocEvents since the secr/materials app isn't managing them
1002+
docs = session.materials.exclude(type='draft')
10011003
docevents = DocEvent.objects.filter(doc__in=docs)
10021004

10031005
path = get_proceedings_path(meeting,group)

ietf/secr/utils/meeting.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ def get_materials(group,meeting):
2020
for doc in session.materials.exclude(states__slug='deleted').order_by('order'):
2121
if doc.type.slug in ('minutes','agenda'):
2222
materials[doc.type.slug] = doc
23+
elif doc.type.slug == 'draft':
24+
continue
25+
# drafts are currently managed directly by the session and document views
2326
elif doc not in materials[doc.type.slug]:
2427
materials[doc.type.slug].append(doc)
2528
return materials

0 commit comments

Comments
 (0)