From 0aa8f8a7ccf12792e2f80f583e66c919b95fc753 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Wed, 5 Oct 2016 13:34:15 +0000 Subject: [PATCH] Don't automatically open a new review request if there's already another open request in the team - Legacy-Id: 12086 --- ietf/doc/views_review.py | 18 +++++++++++------- .../review/partially_completed_review.txt | 8 ++++++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py index 8576059ed..999711415 100644 --- a/ietf/doc/views_review.py +++ b/ietf/doc/views_review.py @@ -470,18 +470,22 @@ def complete_review(request, name, request_id): ) if review_req.state_id == "part-completed": - new_review_req = make_new_review_request_from_existing(review_req) - new_review_req.save() + existing_open_reqs = ReviewRequest.objects.filter(doc=review_req.doc, team=review_req.team, state__in=("requested", "accepted")) + + new_review_req_url = new_review_req = None + if not existing_open_reqs: + new_review_req = make_new_review_request_from_existing(review_req) + new_review_req.save() + + new_review_req_url = urlreverse("ietf.doc.views_review.review_request", kwargs={ "name": new_review_req.doc.name, "request_id": new_review_req.pk }) + new_review_req_url = request.build_absolute_uri(new_review_req_url) subject = "Review of {}-{} completed partially".format(review_req.doc.name, review_req.reviewed_rev) - url = urlreverse("ietf.doc.views_review.review_request", kwargs={ "name": new_review_req.doc.name, "request_id": new_review_req.pk }) - url = request.build_absolute_uri(url) - msg = render_to_string("review/partially_completed_review.txt", { - 'new_review_req_url': url, + "new_review_req_url": new_review_req_url, + "existing_open_reqs": existing_open_reqs, "by": request.user.person, - "new_review_req": new_review_req, }) email_review_request_change(request, review_req, subject, msg, request.user.person, notify_secretary=True, notify_reviewer=False, notify_requested_by=False) diff --git a/ietf/templates/review/partially_completed_review.txt b/ietf/templates/review/partially_completed_review.txt index 3fd6603f7..6d518357c 100644 --- a/ietf/templates/review/partially_completed_review.txt +++ b/ietf/templates/review/partially_completed_review.txt @@ -1,6 +1,10 @@ {% autoescape off %}Review was partially completed by {{ by }}. -A new review request has been registered for completing the review: +{% if new_review_req_url %} +A new review request has been added for completing the review: {{ new_review_req_url }} -{% endautoescape %} +{% else %} +Found {{ existing_open_reqs|length }} open review request{{ existing_open_reqs|pluralize }} on the document so a new +review request has not been added. +{% endif %}{% endautoescape %}