Skip to content

Commit b85052f

Browse files
rjsparksrjsparks
committed
Checkpoint. Lots of tests will still fail. Reordered some migrations. Brought about half of the ietf.doc.views_review views into line with the new models. Next step is the other half.
 - Legacy-Id: 16012
1 parent 82025f9 commit b85052f

File tree

17 files changed

+11447
-11234
lines changed

17 files changed

+11447
-11234
lines changed

‎ietf/dbtemplate/migrations/0003_adjust_review_templates.py‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.11.20 on 2019-03-05 11:39
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations
6+
7+
def forward(apps, schema_editor):
8+
DBTemplate = apps.get_model('dbtemplate', 'DBTemplate')
9+
DBTemplate.objects.filter(id=186).update(content="""I am the assigned Gen-ART reviewer for this draft. The General Area
10+
Review Team (Gen-ART) reviews all IETF documents being processed
11+
by the IESG for the IETF Chair. Please treat these comments just
12+
like any other last call comments.
13+
14+
For more information, please see the FAQ at
15+
16+
<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
17+
18+
Document: {{ assignment.review_request.doc.name }}-??
19+
Reviewer: {{ assignment.reviewer.person.plain_name }}
20+
Review Date: {{ today }}
21+
IETF LC End Date: {% if assignment.review_request.doc.most_recent_ietflc %}{{ assignment.review_request.doc.most_recent_ietflc.expires|date:"Y-m-d" }}{% else %}None{% endif %}
22+
IESG Telechat date: {{ assignment.review_request.doc.telechat_date|default:'Not scheduled for a telechat' }}
23+
24+
Summary:
25+
26+
Major issues:
27+
28+
Minor issues:
29+
30+
Nits/editorial comments:
31+
""")
32+
33+
DBTemplate.objects.filter(id=187).update(content="""I am the assigned Gen-ART reviewer for this draft. The General Area
34+
Review Team (Gen-ART) reviews all IETF documents being processed
35+
by the IESG for the IETF Chair. Please wait for direction from your
36+
document shepherd or AD before posting a new version of the draft.
37+
38+
For more information, please see the FAQ at
39+
40+
<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
41+
42+
Document: {{ assignment.review_request.doc.name }}-??
43+
Reviewer: {{ assignment.reviewer.person.plain_name }}
44+
Review Date: {{ today }}
45+
IETF LC End Date: {% if assignment.review_req.doc.most_recent_ietflc %}{{ assignment.review_request.doc.most_recent_ietflc.expires|date:"Y-m-d" }}{% else %}None{% endif %}
46+
IESG Telechat date: {{ assignment.review_request.doc.telechat_date|default:'Not scheduled for a telechat' }}
47+
48+
Summary:
49+
50+
Major issues:
51+
52+
Minor issues:
53+
54+
Nits/editorial comments:
55+
56+
""")
57+
58+
def reverse(apps, schema_editor):
59+
DBTemplate = apps.get_model('dbtemplate','DBTemplate')
60+
DBTemplate.objects.filter(id=186).update(content="""I am the assigned Gen-ART reviewer for this draft. The General Area
61+
Review Team (Gen-ART) reviews all IETF documents being processed
62+
by the IESG for the IETF Chair. Please treat these comments just
63+
like any other last call comments.
64+
65+
For more information, please see the FAQ at
66+
67+
<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
68+
69+
Document: {{ review_req.doc.name }}-??
70+
Reviewer: {{ review_req.reviewer.person.plain_name }}
71+
Review Date: {{ today }}
72+
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 %}
73+
IESG Telechat date: {{ review_req.doc.telechat_date|default:'Not scheduled for a telechat' }}
74+
75+
Summary:
76+
77+
Major issues:
78+
79+
Minor issues:
80+
81+
Nits/editorial comments:
82+
83+
""")
84+
DBTemplate.objects.filter(id=187).update(content="""I am the assigned Gen-ART reviewer for this draft. The General Area
85+
Review Team (Gen-ART) reviews all IETF documents being processed
86+
by the IESG for the IETF Chair. Please wait for direction from your
87+
document shepherd or AD before posting a new version of the draft.
88+
89+
For more information, please see the FAQ at
90+
91+
<https://trac.ietf.org/trac/gen/wiki/GenArtfaq>.
92+
93+
Document: {{ review_req.doc.name }}-??
94+
Reviewer: {{ review_req.reviewer.person.plain_name }}
95+
Review Date: {{ today }}
96+
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 %}
97+
IESG Telechat date: {{ review_req.doc.telechat_date|default:'Not scheduled for a telechat' }}
98+
99+
Summary:
100+
101+
Major issues:
102+
103+
Minor issues:
104+
105+
Nits/editorial comments:
106+
107+
""")
108+
109+
class Migration(migrations.Migration):
110+
111+
dependencies = [
112+
('dbtemplate', '0002_auto_20180220_1052'),
113+
('doc','0011_reviewassignmentdocevent'),
114+
]
115+
116+
operations = [
117+
migrations.RunPython(forward, reverse)
118+
]

‎ietf/doc/migrations/0011_reviewassignmentdocevent.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Migration(migrations.Migration):
1111

1212
dependencies = [
1313
('review', '0009_refactor_review_request'),
14-
('name', '0006_adjust_statenames'),
14+
('name', '0005_reviewassignmentstatename'),
1515
('doc', '0010_auto_20190225_1302'),
1616
]
1717

‎ietf/doc/tests_review.py‎

Lines changed: 116 additions & 113 deletions
Large diffs are not rendered by default.

‎ietf/doc/urls_review.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
url(r'^(?P<request_id>[0-9]+)/login/$', views_review.review_request_forced_login),
88
url(r'^(?P<request_id>[0-9]+)/close/$', views_review.close_request),
99
url(r'^(?P<request_id>[0-9]+)/assignreviewer/$', views_review.assign_reviewer),
10-
url(r'^(?P<request_id>[0-9]+)/rejectreviewerassignment/$', views_review.reject_reviewer_assignment),
11-
url(r'^(?P<request_id>[0-9]+)/complete/$', views_review.complete_review),
12-
url(r'^(?P<request_id>[0-9]+)/searchmailarchive/$', views_review.search_mail_archive),
10+
url(r'^(?P<assignment_id>[0-9]+)/rejectreviewerassignment/$', views_review.reject_reviewer_assignment),
11+
url(r'^(?P<assignment_id>[0-9]+)/complete/$', views_review.complete_review),
12+
url(r'^(?P<assignment_id>[0-9]+)/searchmailarchive/$', views_review.search_mail_archive),
1313
url(r'^(?P<request_id>[0-9]+)/editcomment/$', views_review.edit_comment),
1414
url(r'^(?P<request_id>[0-9]+)/editdeadline/$', views_review.edit_deadline),
1515
]

‎ietf/doc/views_doc.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,8 @@ def document_main(request, name, rev=None):
598598
# If we want to go back to using markup_txt.markup_unicode, call it explicitly here like this:
599599
# content = markup_txt.markup_unicode(content, split=False, width=80)
600600

601-
review_req = ReviewRequest.objects.filter(review=doc.name).first()
601+
# TODO - verify if this shows other reviews from the same team - I bet it doesn't
602+
review_req = ReviewRequest.objects.filter(reviewassignment__review=doc.name).first()
602603

603604
other_reviews = []
604605
if review_req:

0 commit comments

Comments
 (0)