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

Change the naming algorithm for review documents a bit

Browse source 
- Legacy-Id: 11635
This commit is contained in:
Ole Laursen 2016-07-12 16:02:35 +00:00
parent 562d7da312
commit 308b854d66
3 changed files with 9 additions and 8 deletions

6
ietf/doc/tests_review.py
View file

@ -401,7 +401,7 @@ class ReviewTests(TestCase):
self.assertTrue(review_req.team.acronym.lower() in review_req.review.name)
self.assertTrue(review_req.doc.rev in review_req.review.name)
with open(os.path.join(self.review_subdir, review_req.review.name + "-" + review_req.review.rev + ".txt")) as f:
with open(os.path.join(self.review_subdir, review_req.review.name + ".txt")) as f:
self.assertEqual(f.read(), "This is a review\nwith two lines")
self.assertEqual(len(outbox), 1)
@ -432,7 +432,7 @@ class ReviewTests(TestCase):
review_req = reload_db_objects(review_req)
self.assertEqual(review_req.state_id, "completed")
with open(os.path.join(self.review_subdir, review_req.review.name + "-" + review_req.review.rev + ".txt")) as f:
with open(os.path.join(self.review_subdir, review_req.review.name + ".txt")) as f:
self.assertEqual(f.read(), "This is a review\nwith two lines")
self.assertEqual(len(outbox), 1)
@ -463,7 +463,7 @@ class ReviewTests(TestCase):
review_req = reload_db_objects(review_req)
self.assertEqual(review_req.state_id, "completed")
with open(os.path.join(self.review_subdir, review_req.review.name + "-" + review_req.review.rev + ".txt")) as f:
with open(os.path.join(self.review_subdir, review_req.review.name + ".txt")) as f:
self.assertEqual(f.read(), "This is a review\nwith two lines")
self.assertEqual(len(outbox), 0)

2
ietf/doc/views_doc.py
View file

@ -573,7 +573,7 @@ def document_main(request, name, rev=None):
if doc.type_id == "review":
basename = "{}-{}.txt".format(doc.name, doc.rev)
basename = "{}.txt".format(doc.name, doc.rev)
pathname = os.path.join(doc.get_file_path(), basename)
content = get_document_content(basename, pathname, split=False)

9
ietf/doc/views_review.py
View file

@ -377,11 +377,12 @@ def complete_review(request, name, request_id):
for i in range(1, 100):
name_components = [
"review",
review_req.team.acronym,
review_req.type.slug,
review_req.reviewer.person.ascii_parts()[3],
skip_prefix(review_req.doc.name, "draft-"),
form.cleaned_data["reviewed_rev"],
review_req.team.acronym,
review_req.type.slug if review_req.type.slug != "unknown" else "",
review_req.reviewer.person.ascii_parts()[3],
datetime.date.today().isoformat(),
]
if i > 1:
name_components.append(str(i))
@ -416,7 +417,7 @@ def complete_review(request, name, request_id):
else:
encoded_content = form.cleaned_data['review_content'].encode("utf-8")
filename = os.path.join(review.get_file_path(), '{}-{}.txt'.format(review.name, review.rev))
filename = os.path.join(review.get_file_path(), '{}.txt'.format(review.name, review.rev))
with open(filename, 'wb') as destination:
destination.write(encoded_content)