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
This commit is contained in:
parent
9454c8bb9c
commit
8a5d9d7a72
|
@ -62,7 +62,7 @@ from ietf.mailtrigger.utils import gather_relevant_expansions
|
|||
from ietf.meeting.models import Session
|
||||
from ietf.meeting.utils import group_sessions, get_upcoming_manageable_sessions, sort_sessions
|
||||
from ietf.review.models import ReviewRequest
|
||||
from ietf.review.utils import can_request_review_of_doc
|
||||
from ietf.review.utils import can_request_review_of_doc, review_requests_to_list_for_doc
|
||||
|
||||
def render_document_top(request, doc, tab, name):
|
||||
tabs = []
|
||||
|
@ -357,7 +357,7 @@ def document_main(request, name, rev=None):
|
|||
published = doc.latest_event(type="published_rfc")
|
||||
started_iesg_process = doc.latest_event(type="started_iesg_process")
|
||||
|
||||
review_requests = ReviewRequest.objects.filter(doc=doc).exclude(state__in=["withdrawn", "rejected", "overtaken", "no-response"]).order_by("-time", "-id")
|
||||
review_requests = review_requests_to_list_for_doc(doc)
|
||||
|
||||
return render_to_response("doc/document_draft.html",
|
||||
dict(doc=doc,
|
||||
|
@ -581,7 +581,7 @@ def document_main(request, name, rev=None):
|
|||
|
||||
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")
|
||||
other_reviews = review_requests_to_list_for_doc(review_req.doc).exclude(pk=review_req.pk)
|
||||
|
||||
return render(request, "doc/document_review.html",
|
||||
dict(doc=doc,
|
||||
|
|
|
@ -32,6 +32,11 @@ def can_manage_review_requests_for_team(user, team):
|
|||
|
||||
return Role.objects.filter(name__in=["secr", "delegate"], person__user=user, group=team).exists() or has_role(user, "Secretariat")
|
||||
|
||||
def review_requests_to_list_for_doc(doc):
|
||||
return ReviewRequest.objects.filter(doc=doc).exclude(
|
||||
state__in=["withdrawn", "rejected", "overtaken", "no-response"]
|
||||
).order_by("-time", "-id")
|
||||
|
||||
def make_new_review_request_from_existing(review_req):
|
||||
obj = ReviewRequest()
|
||||
obj.time = review_req.time
|
||||
|
|
|
@ -5,6 +5,11 @@
|
|||
{{ 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>
|
||||
<i>
|
||||
<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 %}
|
||||
- due: {{ review_request.deadline|date:"Y-m-d" }}</a></i>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue