Skip to content

Commit fbd2cd4

Browse files
committed
Provide templates for directly entered review contents for those teams/review-types that have them. Fixes ietf-tools#2075. Commit ready for merge.
- Legacy-Id: 12594
1 parent 10f4892 commit fbd2cd4

2 files changed

Lines changed: 92 additions & 3 deletions

File tree

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import migrations
5+
6+
def forward(apps, schema_editor):
7+
DBTemplate = apps.get_model('dbtemplate','DBTemplate')
8+
Group = apps.get_model('group','Group')
9+
10+
DBTemplate.objects.create(
11+
path='/group/genart/review/content_templates/lc.txt',
12+
title='Template for genart last call reviews',
13+
type_id='plain',
14+
group=Group.objects.get(acronym='genart'),
15+
content="""I am the assigned Gen-ART reviewer for this draft. The General Area
16+
Review Team (Gen-ART) reviews all IETF documents being processed
17+
by the IESG for the IETF Chair. Please treat these comments just
18+
like any other last call comments.
19+
20+
For more information, please see the FAQ at
21+
22+
<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
23+
24+
Document:
25+
Reviewer:
26+
Review Date:
27+
IETF LC End Date:
28+
IESG Telechat date: (if known)
29+
30+
Summary:
31+
32+
Major issues:
33+
34+
Minor issues:
35+
36+
Nits/editorial comments:
37+
"""
38+
)
39+
DBTemplate.objects.create(
40+
path='/group/genart/review/content_templates/telechat.txt',
41+
title='Template for genart telechat reviews',
42+
type_id='plain',
43+
group=Group.objects.get(acronym='genart'),
44+
content="""I am the assigned Gen-ART reviewer for this draft. The General Area
45+
Review Team (Gen-ART) reviews all IETF documents being processed
46+
by the IESG for the IETF Chair. Please wait for direction from your
47+
document shepherd or AD before posting a new version of the draft.
48+
49+
For more information, please see the FAQ at
50+
51+
<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
52+
53+
Document:
54+
Reviewer:
55+
Review Date:
56+
IETF LC End Date:
57+
IESG Telechat date: (if known)
58+
59+
Summary:
60+
61+
Major issues:
62+
63+
Minor issues:
64+
65+
Nits/editorial comments:
66+
"""
67+
)
68+
69+
def reverse(apps, schema_editor):
70+
DBTemplate = apps.get_model('dbtemplate','DBTemplate')
71+
DBTemplate.objects.filter(path__in=['/group/genart/review/content_templates/lc.txt','/group/genart/review/content_templates/telechat.txt']).delete()
72+
73+
74+
class Migration(migrations.Migration):
75+
76+
dependencies = [
77+
('dbtemplate', '0003_review_summary_email'),
78+
]
79+
80+
operations = [
81+
migrations.RunPython(forward,reverse)
82+
]

ietf/doc/views_review.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from django.contrib.auth.decorators import login_required
99
from django.utils.html import mark_safe
1010
from django.core.exceptions import ValidationError
11-
from django.template.loader import render_to_string
11+
from django.template.loader import render_to_string, TemplateDoesNotExist
1212
from django.core.urlresolvers import reverse as urlreverse
1313

1414
from ietf.doc.models import (Document, NewRevisionDocEvent, State, DocAlias,
@@ -573,11 +573,18 @@ def complete_review(request, name, request_id):
573573

574574
return redirect("doc_view", name=review_req.review.name)
575575
else:
576-
form = CompleteReviewForm(review_req, initial={
576+
initial={
577577
"reviewed_rev": review_req.reviewed_rev,
578578
"result": review_req.result_id,
579579
"cc": ", ".join(cc),
580-
})
580+
}
581+
582+
try:
583+
initial['review_content'] = render_to_string('/group/%s/review/content_templates/%s.txt' % (review_req.team.acronym, review_req.type.slug), {})
584+
except TemplateDoesNotExist:
585+
pass
586+
587+
form = CompleteReviewForm(review_req, initial=initial)
581588

582589
mail_archive_query_urls = mailarch.construct_query_urls(review_req)
583590

0 commit comments

Comments
 (0)