From 60fdfa2c838dfa7b39006ad85d0bb515d38a5db1 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Mon, 13 May 2019 12:19:05 +0000
Subject: [PATCH] Fixed template and view to restore previous review display on
 the Manage Unassigned Reviews page.  Fixes issue #2718.  - Legacy-Id: 16205

---
 ietf/group/views.py                           | 21 ++++++++------
 .../group/manage_review_requests.html         | 28 +++++++++++--------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/ietf/group/views.py b/ietf/group/views.py
index bdfd95d8a..4aea76267 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -1404,7 +1404,7 @@ def manage_review_requests(request, acronym, group_type=None, assignment_status=
     review_requests = get_open_review_requests_for_team(group, assignment_status=assignment_status)
 
     document_requests = extract_revision_ordered_review_requests_for_documents_and_replaced(
-        ReviewRequest.objects.filter(state__in=("part-completed", "completed"), team=group).prefetch_related("result"),
+        ReviewRequest.objects.filter(state__in=("part-completed", "completed", "assigned"), team=group).prefetch_related("reviewassignment_set__result"),
         set(r.doc_id for r in review_requests),
     )
 
@@ -1417,16 +1417,19 @@ def manage_review_requests(request, acronym, group_type=None, assignment_status=
 
         # add previous requests
         l = []
+        rev = None
         for r in document_requests.get(req.doc_id, []):
             # take all on the latest reviewed rev
-            if l and l[0].reviewed_rev:
-                if r.doc_id == l[0].doc_id and r.reviewed_rev:
-                    if int(r.reviewed_rev) > int(l[0].reviewed_rev):
-                        l = [r]
-                    elif int(r.reviewed_rev) == int(l[0].reviewed_rev):
-                        l.append(r)
-            else:
-                l = [r]
+            for a in r.reviewassignment_set.all():
+                if l and rev:
+                    if r.doc_id == l[0].doc_id and a.reviewed_rev:
+                        if int(a.reviewed_rev) > rev:
+                            l = [r]
+                        elif int(a.reviewed_rev) == rev:
+                            l.append(r)
+                else:
+                    l = [r]
+                rev = l[0].reviewassignment_set.first().reviewed_rev
 
         augment_review_requests_with_events(l)
 
diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html
index 2da532d96..589bbdc9a 100644
--- a/ietf/templates/group/manage_review_requests.html
+++ b/ietf/templates/group/manage_review_requests.html
@@ -59,18 +59,22 @@
 
                   {% if r.latest_reqs %}
                     {% for rlatest in r.latest_reqs %}
-                      <div>
-			{% if rlatest.reviewed_rev %}
-			  Previous review of <a href="{% url "ietf.doc.views_doc.document_main" name=rlatest.doc_id rev=rlatest.reviewed_rev %}?include_text=1">{% if rlatest.doc_id != r.doc_id %}{{ rlatest.doc_id }}{% endif %}-{{ rlatest.reviewed_rev }}</a>
-			  (<a href="{{ rfcdiff_base_url }}?url1={{ rlatest.doc.name }}-{{ rlatest.reviewed_rev }}&url2={{ r.doc.name }}-{{ r.doc.rev }}">diff</a>):
-			  <a href="{{ rlatest.review.get_absolute_url }}">{% if rlatest.result %}{{ rlatest.result.name }}{% else %}result unavail.{% endif %}</a>
-			  by {{ rlatest.reviewer.person }}{% if rlatest.closed_review_request_event %} {{ rlatest.closed_review_request_event.time.date|date }}{% endif %}
-			{% else %}
-			  Previous review of <a href="{% url "ietf.doc.views_doc.document_main" name=rlatest.doc_id %}?include_text=1">{% if rlatest.doc_id != r.doc_id %}{{ rlatest.doc_id }}{% else %}this document{% endif %}</a>:
-			  <a href="{% url "ietf.doc.views_review.review_request" name=rlatest.doc_id request_id=rlatest.pk %}">{% if rlatest.result %}{{ rlatest.result.name }}{% else %}result unavail.{% endif %}</a>
-			  by {{ rlatest.reviewer.person }}{% if rlatest.closed_review_request_event %} {{ rlatest.closed_review_request_event.time.date|date }}{% endif %}
-			{% endif %}
-                      </div>
+		      {% for alatest in rlatest.reviewassignment_set.all %}
+			<div>
+			  {% if alatest.reviewed_rev %}
+			    Previous review of
+			    <a href="{% url "ietf.doc.views_doc.document_main" name=rlatest.doc_id rev=alatest.reviewed_rev %}?include_text=1">{% if rlatest.doc_id != r.doc_id %}{{ rlatest.doc_id }}{% endif %}-{{ alatest.reviewed_rev }}</a>{% if alatest.reviewed_rev != r.doc.rev %}
+			    (<a href="{{ rfcdiff_base_url }}?url1={{ rlatest.doc.name }}-{{ alatest.reviewed_rev }}&url2={{ r.doc.name }}-{{ r.doc.rev }}">diff</a>){% endif %}:
+			    <a href="{{ alatest.review.get_absolute_url }}">{% if alatest.result %}{{ alatest.result.name }}{% else %}result unavail.{% endif %}</a>
+			    by {{ alatest.reviewer.person }}{% if alatest.closed_review_request_event %} {{ alatest.closed_review_request_event.time.date|date }}{% endif %}
+			  {% else %}
+			    Previous review of
+			    <a href="{% url "ietf.doc.views_doc.document_main" name=rlatest.doc_id %}?include_text=1">{% if rlatest.doc_id != r.doc_id %}{{ rlatest.doc_id }}{% else %}this document{% endif %}</a>:
+			    <a href="{% url "ietf.doc.views_review.review_request" name=rlatest.doc_id request_id=rlatest.pk %}">{% if alatest.result %}{{ alatest.result.name }}{% else %}result unavail.{% endif %}</a>
+			    by {{ alatest.reviewer.person }}{% if alatest.closed_review_request_event %} {{ alatest.closed_review_request_event.time.date|date }}{% endif %}
+			  {% endif %}
+			</div>
+		      {% endfor %}
                     {% endfor %}
                   {% endif %}
                 </div>