From 6ca953ae245afd2254a2a170e26a51453076100a Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Tue, 20 Dec 2016 05:38:02 +0000 Subject: [PATCH] Improve the team review content templates. Related to #2075. Commit ready for merge. - Legacy-Id: 12595 --- .../0004_team_review_content_templates.py | 24 +++++++++---------- ietf/doc/views_review.py | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ietf/dbtemplate/migrations/0004_team_review_content_templates.py b/ietf/dbtemplate/migrations/0004_team_review_content_templates.py index 77076d63b..8b86737a4 100644 --- a/ietf/dbtemplate/migrations/0004_team_review_content_templates.py +++ b/ietf/dbtemplate/migrations/0004_team_review_content_templates.py @@ -10,7 +10,7 @@ def forward(apps, schema_editor): DBTemplate.objects.create( path='/group/genart/review/content_templates/lc.txt', title='Template for genart last call reviews', - type_id='plain', + type_id='django', group=Group.objects.get(acronym='genart'), content="""I am the assigned Gen-ART reviewer for this draft. The General Area Review Team (Gen-ART) reviews all IETF documents being processed @@ -21,11 +21,11 @@ For more information, please see the FAQ at . -Document: -Reviewer: -Review Date: -IETF LC End Date: -IESG Telechat date: (if known) +Document: {{ review_req.doc.name }}-?? +Reviewer: {{ review_req.reviewer.person.plain_name }} +Review Date: {{ today }} +IETF LC End Date: {% if review_req.doc.most_recent_ietflc %}{{ review_req.doc.most_recent_ietflc.expires|date:"Y-m-d" }}{% else %}None{% endif %} +IESG Telechat date: {{ review_req.doc.telechat_date|default:'Not scheduled for a telechat }} Summary: @@ -39,7 +39,7 @@ Nits/editorial comments: DBTemplate.objects.create( path='/group/genart/review/content_templates/telechat.txt', title='Template for genart telechat reviews', - type_id='plain', + type_id='django', group=Group.objects.get(acronym='genart'), content="""I am the assigned Gen-ART reviewer for this draft. The General Area Review Team (Gen-ART) reviews all IETF documents being processed @@ -50,11 +50,11 @@ For more information, please see the FAQ at . -Document: -Reviewer: -Review Date: -IETF LC End Date: -IESG Telechat date: (if known) +Document: {{ review_req.doc.name }}-?? +Reviewer: {{ review_req.reviewer.person.plain_name }} +Review Date: {{ today }} +IETF LC End Date: {% if review_req.doc.most_recent_ietflc %}{{ review_req.doc.most_recent_ietflc.expires|date:"Y-m-d" }}{% else %}None{% endif %} +IESG Telechat date: {{ review_req.doc.telechat_date|default:'Not scheduled for a telechat' }} Summary: diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py index 033c4d3b2..7e9aad465 100644 --- a/ietf/doc/views_review.py +++ b/ietf/doc/views_review.py @@ -580,7 +580,7 @@ def complete_review(request, name, request_id): } try: - initial['review_content'] = render_to_string('/group/%s/review/content_templates/%s.txt' % (review_req.team.acronym, review_req.type.slug), {}) + initial['review_content'] = render_to_string('/group/%s/review/content_templates/%s.txt' % (review_req.team.acronym, review_req.type.slug), {'review_req':review_req,'today':datetime.date.today()}) except TemplateDoesNotExist: pass