fix: regenerate correct shepherd template. Fixes ietf-tools#4558 (ietf-tools#4595)

* fix: regenerate correct shepherd template

* chore: remove unnecessary extra whitespace

* fix: improve readability of code per review comments

Author: rjsparks

ietf/doc/tests_draft.py

@@ -1960,6 +1960,10 @@ def test_shepherd_writeup_generation(self):
         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)

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,
                 ),