Show other reviews of document on the review document page

 - Legacy-Id: 11784

Author: OleLaursen

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

ietf/templates/doc/document_draft.html

@@ -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 %}

ietf/templates/doc/document_review.html

@@ -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>
 

ietf/templates/doc/review_request_summary.html

@@ -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>