From cbb8da73c8de6c5764c2bd8070441b81df616c8c Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Tue, 18 Oct 2022 07:57:08 -0500 Subject: [PATCH] fix: regenerate correct shepherd template. Fixes #4558 (#4595) * fix: regenerate correct shepherd template * chore: remove unnecessary extra whitespace * fix: improve readability of code per review comments --- ietf/doc/tests_draft.py | 4 ++++ ietf/doc/views_draft.py | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py index 3a0f0315c..1adf243e2 100644 --- a/ietf/doc/tests_draft.py +++ b/ietf/doc/tests_draft.py @@ -1960,6 +1960,10 @@ class ShepherdWriteupTests(TestCase): login_testing_unauthorized(self, "secretary", url) r = self.client.get(url) self.assertContains(r, "for Individual Documents", status_code=200) + r = self.client.post(url,dict(reset_text='')) + self.assertContains(r, "for Individual Documents", status_code=200) url = urlreverse('ietf.doc.views_draft.edit_shepherd_writeup', kwargs=dict(name=wg_draft.name)) r = self.client.get(url) self.assertContains(r, "for Group Documents", status_code=200) + r = self.client.post(url,dict(reset_text='')) + self.assertContains(r, "for Group Documents", status_code=200) diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py index e0d73855b..f3a307178 100644 --- a/ietf/doc/views_draft.py +++ b/ietf/doc/views_draft.py @@ -989,14 +989,16 @@ def edit_shepherd_writeup(request, name): return redirect("ietf.doc.views_doc.document_main", name=doc.name) elif "reset_text" in request.POST: + if not doc.group.type.slug or doc.group.type.slug != "wg": + generate_type = "individ" + else: + generate_type = "group" init = { "content": render_to_string( "doc/shepherd_writeup.txt", dict( doc=doc, - type="individ" - if not doc.group.type.slug or doc.group.type.slug != "ietf" - else "group", + type=generate_type, stream=doc.stream.slug, group=doc.group.type.slug, ), @@ -1020,13 +1022,15 @@ def edit_shepherd_writeup(request, name): if previous_writeup: init["content"] = previous_writeup.text else: + if not doc.group.type.slug or doc.group.type.slug != "wg": + generate_type = "individ" + else: + generate_type = "group" init["content"] = render_to_string( "doc/shepherd_writeup.txt", dict( doc=doc, - type="individ" - if not doc.group.type.slug or doc.group.type.slug != "wg" - else "group", + type=generate_type, stream=doc.stream.slug, group=doc.group.type.slug, ),