altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

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

Browse source 
* fix: regenerate correct shepherd template

* chore: remove unnecessary extra whitespace

* fix: improve readability of code per review comments
This commit is contained in:
Robert Sparks 2022-10-18 07:57:08 -05:00 committed by GitHub
parent fffe0c1991
commit cbb8da73c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/doc/tests_draft.py
View file

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

16
ietf/doc/views_draft.py
View file

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