Skip to content

Commit 39dbf43

Browse files
levkowetzlevkowetz
committed
Merged in [13918] from kivinen@iki.fi:
 Unified the review request views to use same template, so they all show same data, in same format. - Legacy-Id: 13936 Note: SVN reference [13918] has been migrated to Git commit b6e036b
2 parents fe19f34 + b6e036b commit 39dbf43

7 files changed

Lines changed: 203 additions & 235 deletions

File tree

‎ietf/doc/tests_review.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ def test_review_request(self):
124124

125125
r = self.client.get(url)
126126
self.assertEqual(r.status_code, 200)
127-
self.assertTrue(review_req.team.acronym.upper() in unicontent(r))
127+
self.assertIn(review_req.team.acronym, unicontent(r))
128+
self.assertIn(review_req.team.name, unicontent(r))
128129

129130
def test_close_request(self):
130131
doc = make_test_data()

‎ietf/templates/doc/document_review.html‎

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,8 @@
2323
</tr>
2424
</thead>
2525

26+
{% include "doc/review/request_info.html" %}
2627
<tbody class="meta">
27-
<tr>
28-
<th></th>
29-
<th>Team</th>
30-
<td class="edit"></td>
31-
<td>
32-
{{ doc.group.name }}
33-
<a href="{{ doc.group.about_url }}">({{ doc.group.acronym }})</a>
34-
35-
{% if snapshot %}
36-
<span class="label label-warning">Snapshot</span>
37-
{% endif %}
38-
</td>
39-
</tr>
40-
41-
<tr>
42-
<th></th>
43-
<th>Title</th>
44-
<td class="edit"></td>
45-
<td>{{ doc.title }}</td>
46-
</tr>
47-
4828
{% if doc.get_state_slug != "active" %}
4929
<tr>
5030
<th></th>
@@ -54,47 +34,6 @@
5434
</tr>
5535
{% endif %}
5636

57-
{% if review_req %}
58-
<tr>
59-
<th></th>
60-
<th>Request</th>
61-
<td class="edit"></td>
62-
<td>{{ review_req.type.name }} - <a href="{% url "ietf.doc.views_review.review_request" review_req.doc.name review_req.pk %}">requested {{ review_req.time|date:"Y-m-d" }}</a></td>
63-
</tr>
64-
65-
<tr>
66-
<th></th>
67-
<th>Reviewer</th>
68-
<td class="edit"></td>
69-
<td>{{ review_req.reviewer.person }}</td>
70-
</tr>
71-
72-
{% if review_req.result %}
73-
<tr>
74-
<th></th>
75-
<th>Review result</th>
76-
<td class="edit"></td>
77-
<td>{{ review_req.result.name }}</td>
78-
</tr>
79-
{% endif %}
80-
{% endif %}
81-
82-
{% if doc.external_url %}
83-
<tr>
84-
<th></th>
85-
<th>Posted at</th>
86-
<td class="edit"></td>
87-
<td><a href="{{ doc.external_url }}">{{ doc.external_url }}</a></td>
88-
</tr>
89-
{% endif %}
90-
91-
<tr>
92-
<th></th>
93-
<th>Last updated</th>
94-
<td class="edit"></td>
95-
<td>{{ doc.time|date:"Y-m-d" }}</td>
96-
</tr>
97-
9837
{% if other_reviews %}
9938
<tr>
10039
<th></th>

‎ietf/templates/doc/review/assign_reviewer.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
{% origin %}
99
<h1>Assign reviewer<br><small>{{ review_req.doc.name }}</small></h1>
1010

11+
{% include "doc/review/request_info.html" %}
12+
1113
<form method="post">
1214
{% csrf_token %}
1315

‎ietf/templates/doc/review/close_request.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
{% origin %}
99
<h1>Close review request<br><small>{{ review_req.doc.name }}</small></h1>
1010

11+
{% include "doc/review/request_info.html" %}
12+
1113
<p>Do you want to close the review request?</p>
1214

1315
<form method="post">

‎ietf/templates/doc/review/reject_reviewer_assignment.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
{% origin %}
99
<h1>Reject review assignment<br><small>{{ review_req.doc.name }}</small></h1>
1010

11+
{% include "doc/review/request_info.html" %}
12+
1113
<p>{{ review_req.reviewer.person }} is currently assigned to do the review. Do you want to reject this assignment?</p>
1214

1315
<form method="post">

‎ietf/templates/doc/review/request_info.html‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
{# Copyright The IETF Trust 2017, All Rights Reserved #}{% load origin %}{% origin %}
2+
<table class="table table-condensed">
3+
<tbody class="meta">
4+
<tr>
5+
<th>Request</th>
6+
<th>Review of</th>
7+
<td>
8+
{% if review_req.requested_rev %}
9+
<a href="{% url "ietf.doc.views_doc.document_main" name=review_req.doc.name rev=review_req.requested_rev %}">{{ review_req.doc.name }}-{{ review_req.requested_rev }}</a>
10+
{% else %}
11+
<a href="{% url "ietf.doc.views_doc.document_main" name=review_req.doc.name %}">{{ review_req.doc.name }}</a>
12+
{% endif %}
13+
</td>
14+
</tr>
15+
16+
<tr>
17+
<th></th>
18+
<th>Requested rev.</th>
19+
<td>
20+
{% if review_req.requested_rev %}
21+
{{ review_req.requested_rev }}
22+
{% else %}
23+
no specific revision
24+
{% endif %}
25+
{% if review_req.reviewed_rev != review_req.doc.rev %}(document currently at {{ review_req.doc.rev }}){% endif %}
26+
</td>
27+
</tr>
28+
29+
<tr>
30+
<th></th>
31+
<th>Type</th>
32+
<td>{{ review_req.type.name }} Review</td>
33+
</tr>
34+
35+
<tr>
36+
<th></th>
37+
<th>Team</th>
38+
<td> {% if review_req %}
39+
{{ review_req.team.name }}
40+
{% else %}
41+
{{ doc.group.name }}
42+
{% endif %}
43+
(<a href="{% url "ietf.group.views.review_requests" group_type=review_req.team.type_id acronym=review_req.team.acronym %}">{{ review_req.team.acronym }}</a>)
44+
</td>
45+
</tr>
46+
47+
<tr>
48+
<th></th>
49+
<th>Deadline</th>
50+
<td>{{ review_req.deadline|date:"Y-m-d" }}</td>
51+
</tr>
52+
53+
<tr>
54+
<th></th>
55+
<th>Requested</th>
56+
<td>{{ review_req.time|date:"Y-m-d" }}</td>
57+
</tr>
58+
59+
{% if review_req.requested_by.name != "(System)" %}
60+
<tr>
61+
<th></th>
62+
<th>Requested by</th>
63+
<td>{{ review_req.requested_by }}</td>
64+
</tr>
65+
{% endif %}
66+
67+
<tr>
68+
<th></th>
69+
<th>Other Reviews</th>
70+
<td>
71+
{% for req in review_req.other_completed_requests %}
72+
{% if req.reviewer == review_req.reviewer %}<strong>{% endif %}
73+
<a href="{% url "ietf.doc.views_review.review_request" name=req.doc request_id=req.id %}">{{req.team.acronym|capfirst}} {{req.type.name}} review of -{{req.reviewed_rev}} by {{req.reviewer.person.plain_name}}</a> {% if req.reviewed_rev != req.doc.rev %} (<a href="{{ rfcdiff_base_url }}?url1={{ req.doc.name }}-{{ req.reviewed_rev }}&url2={{ req.doc.name }}-{{ req.doc.rev }}">diff</a>){% endif %}<br>
74+
{% if req.reviewer == review_req.reviewer %}</strong>{% endif %}
75+
{% endfor %}
76+
</td>
77+
</tr>
78+
79+
{% if review_req.comment %}
80+
<tr>
81+
<th></th>
82+
<th>Comments</th>
83+
<td><pre class="pasted">{{review_req.comment}}</pre>
84+
{% if can_edit_comment %}
85+
<a class="btn btn-default btn-xs" href="{% url "ietf.doc.views_review.edit_comment" name=doc.name request_id=review_req.pk %}"><span class="fa fa-edit"></span> Edit comment</a>
86+
{% endif %}
87+
</td>
88+
</tr>
89+
{% endif %}
90+
</tbody>
91+
92+
<tbody class="meta">
93+
<tr>
94+
<th>Review</th>
95+
<th>State</th>
96+
<td>{{ review_req.state.name }}
97+
{% if snapshot %}
98+
<span class="label label-warning">Snapshot</span>
99+
{% endif %}
100+
</td>
101+
</tr>
102+
103+
<tr>
104+
<th></th>
105+
<th>Reviewer</th>
106+
<td>
107+
{% if review_req.reviewer %}
108+
{{ review_req.reviewer.person }}
109+
{% else %}
110+
None assigned yet
111+
{% endif %}
112+
113+
{% if can_assign_reviewer %}
114+
<a class="btn btn-default btn-xs" href="{% url "ietf.doc.views_review.assign_reviewer" name=doc.name request_id=review_req.pk %}"><span class="fa fa-user"></span> {% if review_req.reviewer %}Reassign{% else %}Assign{% endif %} reviewer</a>
115+
{% endif %}
116+
117+
{% if review_req.reviewer %}
118+
{% if can_reject_reviewer_assignment or can_accept_reviewer_assignment %}
119+
<div class="reviewer-assignment-not-accepted">
120+
{% if review_req.state_id == "requested"%}
121+
<em>Assignment not accepted yet:</em>
122+
{% else %}
123+
<em>Assignment accepted:</em>
124+
{% endif %}
125+
126+
{% if can_reject_reviewer_assignment %}
127+
<a class="btn btn-danger btn-xs" href="{% url "ietf.doc.views_review.reject_reviewer_assignment" name=doc.name request_id=review_req.pk %}"><span class="fa fa-ban"></span> Reject</a>
128+
{% endif %}
129+
130+
{% if can_accept_reviewer_assignment %}
131+
<form style="display:inline" method="post" action="{% url "ietf.doc.views_review.review_request" name=doc.name request_id=review_req.pk %}">{% csrf_token %}<button class="btn btn-success btn-xs" type="submit" name="action" value="accept"><span class="fa fa-check"></span> Accept</button></form>
132+
{% endif %}
133+
</div>
134+
{% endif %}
135+
{% endif %}
136+
</td>
137+
</tr>
138+
139+
<tr>
140+
<th></th>
141+
<th>Review</th>
142+
<td>
143+
{% if review_req.review %}
144+
<a href="{{ review_req.review.get_absolute_url }}">{{ review_req.review.name }}</a>
145+
{% elif review_req.state_id == "requested" or review_req.state_id == "accepted" %}
146+
Not completed yet
147+
{% else %}
148+
Not available
149+
{% endif %}
150+
151+
{% if can_complete_review %}
152+
<a class="btn btn-primary btn-xs" href="{% url "ietf.doc.views_review.complete_review" name=doc.name request_id=review_req.pk %}"><span class="fa fa-pencil-square-o"></span> {% if review_req.state_id == "requested" or review_req.state_id == "accepted" %}Complete review{% else %}Correct review{% endif %}</a>
153+
{% endif %}
154+
</td>
155+
</tr>
156+
157+
{% if review_req.review and review_req.review.external_url %}
158+
<tr>
159+
<th></th>
160+
<th>Posted at</th>
161+
<td>
162+
<a href="{{ review_req.review.external_url }}">{{ review_req.review.external_url }}</a>
163+
</td>
164+
</tr>
165+
{% endif %}
166+
167+
{% if review_req.reviewed_rev %}
168+
<tr>
169+
<th></th>
170+
<th>Reviewed rev.</th>
171+
<td><a href="{% url "ietf.doc.views_doc.document_main" name=review_req.doc.name rev=review_req.reviewed_rev %}">{{ review_req.reviewed_rev }}</a> {% if review_req.reviewed_rev != review_req.doc.rev %}(document currently at {{ review_req.doc.rev }}){% endif %}</td>
172+
</tr>
173+
{% endif %}
174+
175+
{% if review_req.result %}
176+
<tr>
177+
<th></th>
178+
<th>Review result</th>
179+
<td>{{ review_req.result.name }}</td>
180+
</tr>
181+
{% endif %}
182+
183+
{% if doc.time %}
184+
<tr>
185+
<th></th>
186+
<th>Last updated</th>
187+
<td>{{ doc.time|date:"Y-m-d" }}</td>
188+
</tr>
189+
{% endif %}
190+
191+
</tbody>
192+
</table>
193+

0 commit comments

Comments
 (0)