Skip to content

Commit 24dd268

Browse files
committed
Show on document page if teams are not going to review that version
- Legacy-Id: 11851
1 parent dd190b8 commit 24dd268

3 files changed

Lines changed: 20 additions & 3 deletions

File tree

ietf/doc/views_doc.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
from ietf.meeting.utils import group_sessions, get_upcoming_manageable_sessions, sort_sessions
6464
from ietf.review.models import ReviewRequest
6565
from ietf.review.utils import can_request_review_of_doc, review_requests_to_list_for_doc
66+
from ietf.review.utils import no_review_from_teams_on_doc
6667

6768
def render_document_top(request, doc, tab, name):
6869
tabs = []
@@ -358,6 +359,7 @@ def document_main(request, name, rev=None):
358359
started_iesg_process = doc.latest_event(type="started_iesg_process")
359360

360361
review_requests = review_requests_to_list_for_doc(doc)
362+
no_review_from_teams = no_review_from_teams_on_doc(doc, rev or doc.rev)
361363

362364
return render_to_response("doc/document_draft.html",
363365
dict(doc=doc,
@@ -420,6 +422,7 @@ def document_main(request, name, rev=None):
420422
actions=actions,
421423
presentations=presentations,
422424
review_requests=review_requests,
425+
no_review_from_teams=no_review_from_teams,
423426
),
424427
context_instance=RequestContext(request))
425428

ietf/review/utils.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,19 @@ def can_manage_review_requests_for_team(user, team, allow_non_team_personnel=Tru
3535

3636
def review_requests_to_list_for_doc(doc):
3737
return extract_revision_ordered_review_requests_for_documents(
38-
ReviewRequest.objects.exclude(
39-
state__in=["withdrawn", "rejected", "overtaken", "no-response"],
38+
ReviewRequest.objects.filter(
39+
state__in=["requested", "accepted", "part-completed", "completed"],
4040
).prefetch_related("result"),
4141
[doc.name]
4242
).get(doc.pk, [])
4343

44+
def no_review_from_teams_on_doc(doc, rev):
45+
return Group.objects.filter(
46+
reviewrequest__doc=doc,
47+
reviewrequest__reviewed_rev=rev,
48+
reviewrequest__state="no-review-version",
49+
).distinct()
50+
4451
def make_new_review_request_from_existing(review_req):
4552
obj = ReviewRequest()
4653
obj.time = review_req.time
@@ -134,7 +141,7 @@ def close_review_request(request, review_req, close_state):
134141
prev_state = review_req.state
135142
review_req.state = close_state
136143
if close_state.slug == "no-review-version":
137-
review_req.reviewed_rev = review_req.doc.rev # save rev for later reference
144+
review_req.reviewed_rev = review_req.requested_rev or review_req.doc.rev # save rev for later reference
138145
review_req.save()
139146

140147
if not suggested_req:

ietf/templates/doc/document_draft.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,13 @@
202202
{% include "doc/review_request_summary.html" with current_doc_name=doc.name current_rev=doc.rev %}
203203
{% endfor %}
204204

205+
{% if no_review_from_teams %}
206+
{% for team in no_review_from_teams %}
207+
{{ team.acronym.upper }}{% if not forloop.last %},{% endif %}
208+
{% endfor %}
209+
will not review this version
210+
{% endif %}
211+
205212
{% if can_request_review %}
206213
<div>
207214
<a class="btn btn-default btn-xs" href="{% url "ietf.doc.views_review.request_review" doc.name %}"><span class="fa fa-check-circle-o"></span> Request review</a>

0 commit comments

Comments
 (0)