Skip to content

Commit 1b5cdfe

Browse files
levkowetzlevkowetz
committed
Added review assignment information to the review-document view. Addresses issue ietf-tools#2717.
 - Legacy-Id: 16203
1 parent d627049 commit 1b5cdfe

2 files changed

Lines changed: 105 additions & 98 deletions

File tree

‎ietf/doc/views_doc.py‎

Lines changed: 3 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_assignment = ReviewAssignment.objects.filter(review=doc.name).first()
601+
assignments = ReviewAssignment.objects.filter(review=doc.name)
602+
review_assignment = assignments.first()
602603

603604
other_reviews = []
604605
if review_assignment:
@@ -613,6 +614,7 @@ def document_main(request, name, rev=None):
613614
snapshot=snapshot,
614615
review_req=review_assignment.review_request,
615616
other_reviews=other_reviews,
617+
assignments=assignments,
616618
))
617619

618620
raise Http404("Document not found: %s" % (name + ("-%s"%rev if rev else "")))

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

Lines changed: 102 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -104,107 +104,112 @@
104104
</tr>
105105
{% endif %}
106106
</tbody>
107-
</table>
108107

109-
<p><strong>Assignments</strong></p>
110-
{% if can_assign_reviewer %}
111-
<p>
112-
<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> Assign reviewer</a>
113-
</p>
114-
{% endif %}
108+
{% for assignment in assignments %}
109+
<tbody class="meta">
110+
<tr>
111+
<th>{% if forloop.first %}Assignment{{assignments|pluralize}}{% endif %}</th>
112+
<th>Reviewer</th>
113+
<td>
114+
<b>{{ assignment.reviewer.person }}</b>
115+
{% if assignment.can_reject_reviewer_assignment or assignment.can_accept_reviewer_assignment %}
116+
<div class="reviewer-assignment-not-accepted">
117+
{% if assignment.state_id == "assigned"%}
118+
<em>Assignment not accepted yet:</em>
119+
{% else %}
120+
<em>Assignment accepted:</em>
121+
{% endif %}
122+
{% if assignment.can_reject_reviewer_assignment %}
123+
<a class="btn btn-danger btn-xs" href="{% url "ietf.doc.views_review.reject_reviewer_assignment" name=doc.name assignment_id=assignment.pk %}"><span class="fa fa-ban"></span> Reject</a>
124+
{% endif %}
125+
{% if assignment.can_accept_reviewer_assignment %}
126+
<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>
127+
{% endif %}
128+
</div>
129+
{% endif %}
130+
</td>
131+
</tr>
115132

116-
{% for assignment in assignments %}
117-
<div class="panel panel-default">
118-
<div class="panel-heading">
119-
{{ assignment.reviewer.person }}
120-
{% if assignment.can_reject_reviewer_assignment or assignment.can_accept_reviewer_assignment %}
121-
<div class="reviewer-assignment-not-accepted">
122-
{% if assignment.state_id == "assigned"%}
123-
<em>Assignment not accepted yet:</em>
124-
{% else %}
125-
<em>Assignment accepted:</em>
126-
{% endif %}
127-
{% if assignment.can_reject_reviewer_assignment %}
128-
<a class="btn btn-danger btn-xs" href="{% url "ietf.doc.views_review.reject_reviewer_assignment" name=doc.name assignment_id=assignment.pk %}"><span class="fa fa-ban"></span> Reject</a>
129-
{% endif %}
130-
{% if assignment.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-
</div>
136-
<div class="panel-body">
137-
<table class="table table-condensed">
138-
<tbody class="panel-meta">
139-
<tr>
140-
<th>State</th>
141-
<td>{{ assignment.state.name }}
142-
{% if snapshot %}
143-
<span class="label label-warning">Snapshot</span>
144-
{% endif %}
145-
</td>
146-
</tr>
147-
148-
{% if assignment.state_id != "withdrawn" and assignment.state_id != "no-response" and assignment.state_id != "rejected" %}
149-
<tr>
150-
<th>Review</th>
151-
<td>
152-
{% if assignment.review %}
153-
<a href="{{ assignment.review.get_absolute_url }}">{{ assignment.review.name }}</a>
154-
{% elif assignment.state_id == "assigned" or assignment.state_id == "accepted" %}
155-
Not completed yet
156-
{% else %}
157-
Not available
158-
{% endif %}
159-
160-
{% if assignment.can_complete_review %}
161-
<a class="btn btn-primary btn-xs" href="{% url "ietf.doc.views_review.complete_review" name=doc.name assignment_id=assignment.pk %}"><span class="fa fa-pencil-square-o"></span> {% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %}Complete review{% else %}Correct review{% endif %}</a>
162-
{% endif %}
163-
164-
{% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %}
165-
{% if can_assign_reviewer %}
166-
<a class="btn btn-danger btn-xs" href="{% url "ietf.doc.views_review.mark_reviewer_assignment_no_response" name=doc.name assignment_id=assignment.pk %}"><span class="fa fa-ban"></span> No response</a>
167-
<a class="btn btn-danger btn-xs" href="{% url "ietf.doc.views_review.withdraw_reviewer_assignment" name=doc.name assignment_id=assignment.pk %}"><span class="fa fa-ban"></span> Withdraw</a>
168-
{% endif %}
169-
{% endif %}
170-
</td>
171-
</tr>
172-
{% endif %}
133+
<tr>
134+
<th></th>
135+
<th>State</th>
136+
<td>{{ assignment.state.name }}
137+
{% if snapshot %}
138+
<span class="label label-warning">Snapshot</span>
139+
{% endif %}
140+
</td>
141+
</tr>
173142

174-
{% if assignment.review and assignment.review.external_url %}
175-
<tr>
176-
<th>Posted at</th>
177-
<td>
178-
<a href="{{ assignment.review.external_url }}">{{ assignment.review.external_url }}</a>
179-
</td>
180-
</tr>
181-
{% endif %}
143+
{% if assignment.state_id != "withdrawn" and assignment.state_id != "no-response" and assignment.state_id != "rejected" %}
144+
<tr>
145+
<th></th>
146+
<th>Review</th>
147+
<td>
148+
{% if assignment.review %}
149+
<a href="{{ assignment.review.get_absolute_url }}">{{ assignment.review.name }}</a>
150+
{% elif assignment.state_id == "assigned" or assignment.state_id == "accepted" %}
151+
Not completed yet
152+
{% else %}
153+
Not available
154+
{% endif %}
155+
156+
{% if assignment.can_complete_review %}
157+
<a class="btn btn-primary btn-xs" href="{% url "ietf.doc.views_review.complete_review" name=doc.name assignment_id=assignment.pk %}"><span class="fa fa-pencil-square-o"></span> {% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %}Complete review{% else %}Correct review{% endif %}</a>
158+
{% endif %}
159+
160+
{% if assignment.state_id == "assigned" or assignment.state_id == "accepted" %}
161+
{% if can_assign_reviewer %}
162+
<a class="btn btn-danger btn-xs" href="{% url "ietf.doc.views_review.mark_reviewer_assignment_no_response" name=doc.name assignment_id=assignment.pk %}"><span class="fa fa-ban"></span> No response</a>
163+
<a class="btn btn-danger btn-xs" href="{% url "ietf.doc.views_review.withdraw_reviewer_assignment" name=doc.name assignment_id=assignment.pk %}"><span class="fa fa-ban"></span> Withdraw</a>
164+
{% endif %}
165+
{% endif %}
166+
</td>
167+
</tr>
168+
{% endif %}
182169

183-
{% if assignment.reviewed_rev %}
184-
<tr>
185-
<th>Reviewed rev.</th>
186-
<td><a href="{% url "ietf.doc.views_doc.document_main" name=review_req.doc.name rev=assignment.reviewed_rev %}">{{ assignment.reviewed_rev }}</a> {% if assignment.reviewed_rev != review_req.doc.rev %}(document currently at {{ review_req.doc.rev }}){% endif %}</td>
187-
</tr>
188-
{% endif %}
170+
{% if assignment.review and assignment.review.external_url %}
171+
<tr>
172+
<th></th>
173+
<th>Posted at</th>
174+
<td>
175+
<a href="{{ assignment.review.external_url }}">{{ assignment.review.external_url }}</a>
176+
</td>
177+
</tr>
178+
{% endif %}
189179

190-
{% if assignment.result %}
191-
<tr>
192-
<th>Review result</th>
193-
<td>{{ assignment.result.name }}</td>
194-
</tr>
195-
{% endif %}
180+
{% if assignment.reviewed_rev %}
181+
<tr>
182+
<th></th>
183+
<th>Reviewed rev.</th>
184+
<td><a href="{% url "ietf.doc.views_doc.document_main" name=review_req.doc.name rev=assignment.reviewed_rev %}">{{ assignment.reviewed_rev }}</a> {% if assignment.reviewed_rev != review_req.doc.rev %}(document currently at {{ review_req.doc.rev }}){% endif %}</td>
185+
</tr>
186+
{% endif %}
196187

188+
{% if assignment.result %}
189+
<tr>
190+
<th></th>
191+
<th>Review result</th>
192+
<td>{{ assignment.result.name }}</td>
193+
</tr>
194+
{% endif %}
197195

198-
{% if assignment.state_id == "completed" or assignment.state_id == "part-completed" %}
199-
<tr>
200-
<th>Review completed:</th>
201-
<td>
202-
{{ assignment.completed_on|date:"Y-m-d" }}
203-
</td>
204-
</tr>
205-
{% endif %}
206-
</tbody>
207-
</table>
208-
</div>
209-
</div>
210-
{% endfor %}
196+
197+
{% if assignment.state_id == "completed" or assignment.state_id == "part-completed" %}
198+
<tr>
199+
<th></th>
200+
<th>Review completed:</th>
201+
<td>
202+
{{ assignment.completed_on|date:"Y-m-d" }}
203+
</td>
204+
</tr>
205+
{% endif %}
206+
</tbody>
207+
{% endfor %}
208+
</table>
209+
210+
{% if can_assign_reviewer %}
211+
<p>
212+
<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> Assign reviewer</a>
213+
</p>
214+
{% endif %}
215+

0 commit comments

Comments
 (0)