Review assignment email includes a link to the review request that ensures the reviewer is logged in. Fixes #2543. Commit ready for merge
- Legacy-Id: 15444
This commit is contained in:
parent
e351d321a6
commit
fd8af4b6f7
|
@ -143,6 +143,14 @@ class ReviewTests(TestCase):
|
|||
self.assertIn(review_req.team.acronym, unicontent(r))
|
||||
self.assertIn(review_req.team.name, unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.doc.views_review.review_request_forced_login', kwargs={ "name": doc.name, "request_id": review_req.pk })
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 302)
|
||||
self.client.login(username='reviewer', password="reviewer+password")
|
||||
r = self.client.get(url,follow=True)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
|
||||
|
||||
def test_close_request(self):
|
||||
doc = WgDraftFactory(group__acronym='mars',rev='01')
|
||||
review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut"))
|
||||
|
|
|
@ -4,6 +4,7 @@ from ietf.utils.urls import url
|
|||
urlpatterns = [
|
||||
url(r'^$', views_review.request_review),
|
||||
url(r'^(?P<request_id>[0-9]+)/$', views_review.review_request),
|
||||
url(r'^(?P<request_id>[0-9]+)/login/$', views_review.review_request_forced_login),
|
||||
url(r'^(?P<request_id>[0-9]+)/close/$', views_review.close_request),
|
||||
url(r'^(?P<request_id>[0-9]+)/assignreviewer/$', views_review.assign_reviewer),
|
||||
url(r'^(?P<request_id>[0-9]+)/rejectreviewerassignment/$', views_review.reject_reviewer_assignment),
|
||||
|
|
|
@ -173,6 +173,11 @@ def request_review(request, name):
|
|||
'scheduled_for_telechat_days': (scheduled_for_telechat - now.date()).days if scheduled_for_telechat else None,
|
||||
})
|
||||
|
||||
@login_required
|
||||
def review_request_forced_login(request, name, request_id):
|
||||
return redirect(urlreverse("ietf.doc.views_review.review_request", kwargs={ "name": name, "request_id": request_id }))
|
||||
|
||||
|
||||
def review_request(request, name, request_id):
|
||||
doc = get_object_or_404(Document, name=name)
|
||||
review_req = get_object_or_404(ReviewRequest, pk=request_id)
|
||||
|
|
|
@ -361,7 +361,7 @@ def email_review_request_change(request, review_req, subject, msg, by, notify_se
|
|||
|
||||
to = list(to)
|
||||
|
||||
url = urlreverse("ietf.doc.views_review.review_request", kwargs={ "name": review_req.doc.name, "request_id": review_req.pk })
|
||||
url = urlreverse("ietf.doc.views_review.review_request_forced_login", kwargs={ "name": review_req.doc.name, "request_id": review_req.pk })
|
||||
url = request.build_absolute_uri(url)
|
||||
send_mail(request, to, request.user.person.formatted_email(), subject, "review/review_request_changed.txt", {
|
||||
"review_req_url": url,
|
||||
|
|
Loading…
Reference in a new issue