Skip to content

Commit 8a5d9d7

Browse files
committed
Make it more obvious that a review is not completed yet, include
ongoing reviews in the list on the review document page - Legacy-Id: 11785
1 parent 9454c8b commit 8a5d9d7

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

ietf/doc/views_doc.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
from ietf.meeting.models import Session
6363
from ietf.meeting.utils import group_sessions, get_upcoming_manageable_sessions, sort_sessions
6464
from ietf.review.models import ReviewRequest
65-
from ietf.review.utils import can_request_review_of_doc
65+
from ietf.review.utils import can_request_review_of_doc, review_requests_to_list_for_doc
6666

6767
def render_document_top(request, doc, tab, name):
6868
tabs = []
@@ -357,7 +357,7 @@ def document_main(request, name, rev=None):
357357
published = doc.latest_event(type="published_rfc")
358358
started_iesg_process = doc.latest_event(type="started_iesg_process")
359359

360-
review_requests = ReviewRequest.objects.filter(doc=doc).exclude(state__in=["withdrawn", "rejected", "overtaken", "no-response"]).order_by("-time", "-id")
360+
review_requests = review_requests_to_list_for_doc(doc)
361361

362362
return render_to_response("doc/document_draft.html",
363363
dict(doc=doc,
@@ -581,7 +581,7 @@ def document_main(request, name, rev=None):
581581

582582
other_reviews = []
583583
if review_req:
584-
other_reviews = ReviewRequest.objects.filter(doc=review_req.doc, state__in=["completed", "part-completed"]).exclude(pk=review_req.pk).order_by("-time", "-id")
584+
other_reviews = review_requests_to_list_for_doc(review_req.doc).exclude(pk=review_req.pk)
585585

586586
return render(request, "doc/document_review.html",
587587
dict(doc=doc,

ietf/review/utils.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ def can_manage_review_requests_for_team(user, team):
3232

3333
return Role.objects.filter(name__in=["secr", "delegate"], person__user=user, group=team).exists() or has_role(user, "Secretariat")
3434

35+
def review_requests_to_list_for_doc(doc):
36+
return ReviewRequest.objects.filter(doc=doc).exclude(
37+
state__in=["withdrawn", "rejected", "overtaken", "no-response"]
38+
).order_by("-time", "-id")
39+
3540
def make_new_review_request_from_existing(review_req):
3641
obj = ReviewRequest()
3742
obj.time = review_req.time

ietf/templates/doc/review_request_summary.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
{{ review_request.result.name }} {% if review_request.state_id == "part-completed" %}(partially completed){% endif %}
66
- reviewer: {{ review_request.reviewer.person }}</a>
77
{% else %}
8-
<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>
8+
<i>
9+
<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
10+
{% if review_request.reviewer %}
11+
- reviewer: {{ review_request.reviewer.person }}
12+
{% endif %}
13+
- due: {{ review_request.deadline|date:"Y-m-d" }}</a></i>
914
{% endif %}
1015
</div>

0 commit comments

Comments
 (0)