Skip to content

Commit 0aa8f8a

Browse files
committed
Don't automatically open a new review request if there's already
another open request in the team - Legacy-Id: 12086
1 parent 037556b commit 0aa8f8a

2 files changed

Lines changed: 17 additions & 9 deletions

File tree

ietf/doc/views_review.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -470,18 +470,22 @@ def complete_review(request, name, request_id):
470470
)
471471

472472
if review_req.state_id == "part-completed":
473-
new_review_req = make_new_review_request_from_existing(review_req)
474-
new_review_req.save()
473+
existing_open_reqs = ReviewRequest.objects.filter(doc=review_req.doc, team=review_req.team, state__in=("requested", "accepted"))
475474

476-
subject = "Review of {}-{} completed partially".format(review_req.doc.name, review_req.reviewed_rev)
475+
new_review_req_url = new_review_req = None
476+
if not existing_open_reqs:
477+
new_review_req = make_new_review_request_from_existing(review_req)
478+
new_review_req.save()
479+
480+
new_review_req_url = urlreverse("ietf.doc.views_review.review_request", kwargs={ "name": new_review_req.doc.name, "request_id": new_review_req.pk })
481+
new_review_req_url = request.build_absolute_uri(new_review_req_url)
477482

478-
url = urlreverse("ietf.doc.views_review.review_request", kwargs={ "name": new_review_req.doc.name, "request_id": new_review_req.pk })
479-
url = request.build_absolute_uri(url)
483+
subject = "Review of {}-{} completed partially".format(review_req.doc.name, review_req.reviewed_rev)
480484

481485
msg = render_to_string("review/partially_completed_review.txt", {
482-
'new_review_req_url': url,
486+
"new_review_req_url": new_review_req_url,
487+
"existing_open_reqs": existing_open_reqs,
483488
"by": request.user.person,
484-
"new_review_req": new_review_req,
485489
})
486490

487491
email_review_request_change(request, review_req, subject, msg, request.user.person, notify_secretary=True, notify_reviewer=False, notify_requested_by=False)
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{% autoescape off %}Review was partially completed by {{ by }}.
22

3-
A new review request has been registered for completing the review:
3+
{% if new_review_req_url %}
4+
A new review request has been added for completing the review:
45

56
{{ new_review_req_url }}
6-
{% endautoescape %}
7+
{% else %}
8+
Found {{ existing_open_reqs|length }} open review request{{ existing_open_reqs|pluralize }} on the document so a new
9+
review request has not been added.
10+
{% endif %}{% endautoescape %}

0 commit comments

Comments
 (0)