diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py index 88330cd1d..080450447 100644 --- a/ietf/doc/views_doc.py +++ b/ietf/doc/views_doc.py @@ -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 diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index 6b43d3db9..8e6a22189 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -198,17 +198,8 @@ Reviews - {% for r in review_requests %} -
- {% if r.state_id == "completed" or r.state_id == "part-completed" %} - - {{ 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 }} - {% else %} - {{ r.team.acronym|upper }} {{ r.type.name }} Review{% if r.reviewer %} (reviewer: {{ r.reviewer.person }}){% endif %} - {% endif %} -
+ {% for review_request in review_requests %} + {% include "doc/review_request_summary.html" with current_rev=doc.rev %} {% endfor %} {% if can_request_review %} diff --git a/ietf/templates/doc/document_review.html b/ietf/templates/doc/document_review.html index 8a684e10b..0745a8c42 100644 --- a/ietf/templates/doc/document_review.html +++ b/ietf/templates/doc/document_review.html @@ -92,6 +92,19 @@ {{ doc.time|date:"Y-m-d" }} + + {% if other_reviews %} + + + Other reviews + + + {% for review_request in other_reviews %} + {% include "doc/review_request_summary.html" with current_rev=review_req.reviewed_rev %} + {% endfor %} + + + {% endif %} diff --git a/ietf/templates/doc/review_request_summary.html b/ietf/templates/doc/review_request_summary.html new file mode 100644 index 000000000..331af5852 --- /dev/null +++ b/ietf/templates/doc/review_request_summary.html @@ -0,0 +1,10 @@ +
+ {% if review_request.state_id == "completed" or review_request.state_id == "part-completed" %} + + {{ 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 }} + {% else %} + {{ review_request.team.acronym|upper }} {{ review_request.type.name }} Review{% if review_request.reviewer %} (reviewer: {{ review_request.reviewer.person }}){% endif %} + {% endif %} +