altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Show other reviews of document on the review document page

Browse source 
- Legacy-Id: 11784
This commit is contained in:
Ole Laursen 2016-08-15 14:41:12 +00:00
parent 1ae302ca07
commit 9454c8bb9c
4 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ietf/doc/views_doc.py
View file

@ -579,6 +579,10 @@ def document_main(request, name, rev=None):
review_req = ReviewRequest.objects.filter(review=doc.name).first()
other_reviews = []
if review_req:
other_reviews = ReviewRequest.objects.filter(doc=review_req.doc, state__in=["completed", "part-completed"]).exclude(pk=review_req.pk).order_by("-time", "-id")
return render(request, "doc/document_review.html",
dict(doc=doc,
top=top,
@ -587,6 +591,7 @@ def document_main(request, name, rev=None):
latest_rev=latest_rev,
snapshot=snapshot,
review_req=review_req,
other_reviews=other_reviews,
))
raise Http404

13
ietf/templates/doc/document_draft.html
View file

@ -198,17 +198,8 @@
<th>Reviews</th>
<td class="edit"></td>
<td>
{% for r in review_requests %}
<div>
{% if r.state_id == "completed" or r.state_id == "part-completed" %}
<a href="{% if r.review %}{% url "doc_view" r.review.name %}{% else %}{% url "ietf.doc.views_review.review_request" r.doc_id r.pk %}{% endif %}">
{{ r.team.acronym|upper }} {{ r.type.name }} Review{% if r.reviewed_rev and r.reviewed_rev != doc.rev %} (of -{{ r.reviewed_rev }}){% endif %}:
{{ r.result.name }} {% if r.state_id == "part-completed" %}(partially completed){% endif %}
- reviewer: {{ r.reviewer.person }}</a>
{% else %}
<a href="{% url "ietf.doc.views_review.review_request" r.doc_id r.pk %}">{{ r.team.acronym|upper }} {{ r.type.name }} Review{% if r.reviewer %} (reviewer: {{ r.reviewer.person }}){% endif %}</a>
{% endif %}
</div>
{% for review_request in review_requests %}
{% include "doc/review_request_summary.html" with current_rev=doc.rev %}
{% endfor %}
{% if can_request_review %}

13
ietf/templates/doc/document_review.html
View file

@ -92,6 +92,19 @@
<td class="edit"></td>
<td>{{ doc.time|date:"Y-m-d" }}</td>
</tr>
{% if other_reviews %}
<tr>
<th></th>
<th>Other reviews</th>
<td class="edit"></td>
<td>
{% for review_request in other_reviews %}
{% include "doc/review_request_summary.html" with current_rev=review_req.reviewed_rev %}
{% endfor %}
</td>
</tr>
{% endif %}
</tbody>
</table>

10
ietf/templates/doc/review_request_summary.html Normal file
View file

@ -0,0 +1,10 @@
<div class="review-request-summary">
{% if review_request.state_id == "completed" or review_request.state_id == "part-completed" %}
<a href="{% if review_request.review %}{% url "doc_view" review_request.review.name %}{% else %}{% url "ietf.doc.views_review.review_request" review_request.doc_id review_request.pk %}{% endif %}">
{{ review_request.team.acronym|upper }} {{ review_request.type.name }} Review{% if review_request.reviewed_rev and review_request.reviewed_rev != current_rev %} (of -{{ review_request.reviewed_rev }}){% endif %}:
{{ review_request.result.name }} {% if review_request.state_id == "part-completed" %}(partially completed){% endif %}
- reviewer: {{ review_request.reviewer.person }}</a>
{% else %}
<a href="{% url "ietf.doc.views_review.review_request" review_request.doc_id review_request.pk %}">{{ review_request.team.acronym|upper }} {{ review_request.type.name }} Review{% if review_request.reviewer %} (reviewer: {{ review_request.reviewer.person }}){% endif %}</a>
{% endif %}
</div>