Support accepting a reviewer assignment

 - Legacy-Id: 11237

Author: OleLaursen

ietf/doc/tests_review.py

@@ -4,6 +4,8 @@
 
 from django.core.urlresolvers import reverse as urlreverse
 
+from pyquery import PyQuery
+
 import debug                            # pyflakes:ignore
 
 from ietf.review.models import ReviewRequest, Reviewer
@@ -169,6 +171,27 @@ def test_assign_reviewer(self):
         self.assertTrue("cancelled your assignment" in unicode(outbox[0]))
         self.assertTrue("assigned" in unicode(outbox[1]))
 
+    def test_accept_reviewer_assignment(self):
+        doc = make_test_data()
+        review_req = make_review_data(doc)
+        review_req.state = ReviewRequestStateName.objects.get(slug="requested")
+        review_req.save()
+
+        url = urlreverse('ietf.doc.views_review.review_request', kwargs={ "name": doc.name, "request_id": review_req.pk })
+        username = review_req.reviewer.person.user.username
+        self.client.login(username=username, password=username + "+password")
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(q("[name=action][value=accept]"))
+
+        # accept
+        r = self.client.post(url, { "action": "accept" })
+        self.assertEqual(r.status_code, 302)
+
+        review_req = reload_db_objects(review_req)
+        self.assertEqual(review_req.state_id, "accepted")
+
     def test_reject_reviewer_assignment(self):
         doc = make_test_data()
         review_req = make_review_data(doc)

ietf/doc/views_review.py

@@ -107,24 +107,36 @@ def review_request(request, name, request_id):
     review_req = get_object_or_404(ReviewRequest, pk=request_id)
 
     is_reviewer = review_req.reviewer and user_is_person(request.user, review_req.reviewer.person)
-    can_manage_req = can_manage_review_requests_for_team(request.user, review_req.team)
+    can_manage_request = can_manage_review_requests_for_team(request.user, review_req.team)
 
     can_withdraw_request = (review_req.state_id in ["requested", "accepted"]
-                            and is_authorized_in_doc_stream(request.user, doc))
+                            and (is_authorized_in_doc_stream(request.user, doc)
+                                 or can_manage_request))
 
     can_assign_reviewer = (review_req.state_id in ["requested", "accepted"]
                            and is_authorized_in_doc_stream(request.user, doc))
 
+    can_accept_reviewer_assignment = (review_req.state_id == "requested"
+                                      and review_req.reviewer_id is not None
+                                      and (is_reviewer or can_manage_request))
+
     can_reject_reviewer_assignment = (review_req.state_id in ["requested", "accepted"]
                                       and review_req.reviewer_id is not None
-                                      and (is_reviewer or can_manage_req))
+                                      and (is_reviewer or can_manage_request))
+
+    if request.method == "POST" and request.POST.get("action") == "accept" and can_accept_reviewer_assignment:
+        review_req.state = ReviewRequestStateName.objects.get(slug="accepted")
+        review_req.save()
+
+        return redirect(review_request, name=review_req.doc.name, request_id=review_req.pk)
 
     return render(request, 'doc/review/review_request.html', {
         'doc': doc,
         'review_req': review_req,
         'can_withdraw_request': can_withdraw_request,
         'can_reject_reviewer_assignment': can_reject_reviewer_assignment,
         'can_assign_reviewer': can_assign_reviewer,
+        'can_accept_reviewer_assignment': can_accept_reviewer_assignment,
     })
 
 def withdraw_request(request, name, request_id):
@@ -183,9 +195,9 @@ def assign_reviewer(request, name, request_id):
     doc = get_object_or_404(Document, name=name)
     review_req = get_object_or_404(ReviewRequest, pk=request_id, state__in=["requested", "accepted"])
 
-    can_manage_req = can_manage_review_requests_for_team(request.user, review_req.team)
+    can_manage_request = can_manage_review_requests_for_team(request.user, review_req.team)
 
-    if not can_manage_req:
+    if not can_manage_request:
         return HttpResponseForbidden("You do not have permission to perform this action")
 
     if request.method == "POST" and request.POST.get("action") == "assign":
@@ -215,9 +227,9 @@ def reject_reviewer_assignment(request, name, request_id):
         return redirect(review_request, name=review_req.doc.name, request_id=review_req.pk)
 
     is_reviewer = user_is_person(request.user, review_req.reviewer.person)
-    can_manage_req = can_manage_review_requests_for_team(request.user, review_req.team)
+    can_manage_request = can_manage_review_requests_for_team(request.user, review_req.team)
 
-    if not (is_reviewer or can_manage_req):
+    if not (is_reviewer or can_manage_request):
         return HttpResponseForbidden("You do not have permission to perform this action")
 
     if request.method == "POST" and request.POST.get("action") == "reject":

ietf/templates/doc/review/review_request.html

@@ -70,12 +70,16 @@ <h1>Review request<br><small>{{ review_req.doc.name }}</small></h1>
               None assigned yet
             {% endif %}
 
-            {% if can_assign_reviewer %}
-              <a class="btn btn-default btn-xs" href="{% url "ietf.doc.views_review.assign_reviewer" name=doc.name request_id=review_req.pk %}"><span class="fa fa-user"></span> {% if review_req.reviewer %}Reassign{% else %}Assign{% endif %} reviewer</a>
+            {% if can_accept_reviewer_assignment %}
+              <form style="display:inline" method="post" action="{% url "ietf.doc.views_review.review_request" name=doc.name request_id=review_req.pk %}"><button class="btn btn-default btn-xs" type="submit" name="action" value="accept"><span class="fa fa-check"></span> Accept</button></form>
             {% endif %}
 
             {% if can_reject_reviewer_assignment %}
-              <a class="btn btn-default btn-xs" href="{% url "ietf.doc.views_review.reject_reviewer_assignment" name=doc.name request_id=review_req.pk %}"><span class="fa fa-ban"></span> Reject reviewer assignment</a>
+              <a class="btn btn-default btn-xs" href="{% url "ietf.doc.views_review.reject_reviewer_assignment" name=doc.name request_id=review_req.pk %}"><span class="fa fa-ban"></span> Reject</a>
+            {% endif %}
+
+            {% if can_assign_reviewer %}
+              <a class="btn btn-default btn-xs" href="{% url "ietf.doc.views_review.assign_reviewer" name=doc.name request_id=review_req.pk %}"><span class="fa fa-user"></span> {% if review_req.reviewer %}Reassign{% else %}Assign{% endif %} reviewer</a>
             {% endif %}
           </td>
         </tr>