Skip to content

Commit 9621eaf

Browse files
committed
Merged in [19180] from rcross@amsl.com:
Fix Telechat app bug, draft with no ballot. - Legacy-Id: 19181 Note: SVN reference [19180] has been migrated to Git commit d216a18
2 parents 74eb7c1 + d216a18 commit 9621eaf

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

ietf/secr/telechat/tests.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,17 @@ def test_doc_detail_conflict_review_no_ballot(self):
105105
response = self.client.get(url)
106106
self.assertEqual(response.status_code, 200)
107107

108+
def test_doc_detail_draft_no_ballot(self):
109+
draft = IndividualDraftFactory(name='draft-imaginary-independent-submission')
110+
by=Person.objects.get(name="(System)")
111+
d = get_next_telechat_date()
112+
date = d.strftime('%Y-%m-%d')
113+
update_telechat(None, draft, by, d)
114+
url = reverse('ietf.secr.telechat.views.doc_detail', kwargs={'date':date, 'name':draft.name})
115+
self.client.login(username="secretary", password="secretary+password")
116+
response = self.client.get(url)
117+
self.assertEqual(response.status_code, 200)
118+
108119
def test_doc_detail_charter(self):
109120
by=Person.objects.get(name="(System)")
110121
charter = CharterFactory(states=[('charter','intrev')])

ietf/secr/telechat/views.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,8 @@ def doc_detail(request, date, name):
216216
# need to use curry here to pass custom variable to form init
217217
if doc.active_ballot():
218218
ballot_type = doc.active_ballot().ballot_type
219+
elif doc.type.slug == 'draft':
220+
ballot_type = BallotType.objects.get(doc_type__slug='draft', slug='approve')
219221
else:
220222
ballot_type = BallotType.objects.get(doc_type=doc.type)
221223
BallotFormset = formset_factory(BallotForm, extra=0)

0 commit comments

Comments
 (0)