Skip to content

Commit c006c44

Browse files
committed
Added setting of document author for review document objects.
- Legacy-Id: 12957
1 parent 920d05b commit c006c44

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

ietf/doc/tests_review.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,10 @@ def test_complete_review_upload_content(self):
574574

575575
self.assertTrue(settings.MAILING_LIST_ARCHIVE_URL in review_req.review.external_url)
576576

577+
# Check that the review has the reviewer as author
578+
self.assertEqual(review_req.reviewer, review_req.review.authors.first())
579+
580+
# Check that we have a copy of the outgoing message
577581
msgid = outbox[0]["Message-ID"]
578582
message = Message.objects.get(msgid=msgid)
579583
self.assertEqual(email.utils.parseaddr(outbox[0]["To"]), email.utils.parseaddr(message.to))

ietf/doc/views_review.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from django.core.urlresolvers import reverse as urlreverse
1313

1414
from ietf.doc.models import (Document, NewRevisionDocEvent, State, DocAlias,
15-
LastCallDocEvent, ReviewRequestDocEvent)
15+
LastCallDocEvent, ReviewRequestDocEvent, DocumentAuthor)
1616
from ietf.name.models import ReviewRequestStateName, ReviewResultName, DocTypeName
1717
from ietf.review.models import ReviewRequest
1818
from ietf.group.models import Group
@@ -557,14 +557,18 @@ def complete_review(request, name, request_id):
557557

558558
email_review_request_change(request, review_req, subject, msg, request.user.person, notify_secretary=True, notify_reviewer=False, notify_requested_by=False)
559559

560+
role = request.user.person.role_set.filter(group=review_req.team,name='reviewer').first()
561+
if role and role.email.active:
562+
author_email = role.email
563+
frm = role.formatted_email()
564+
else:
565+
author_email = request.user.person.email()
566+
frm = request.user.person.formatted_email()
567+
author, created = DocumentAuthor.objects.get_or_create(document=review, author=author_email)
568+
560569
if need_to_email_review:
561570
# email the review
562571
subject = "{} of {}-{}".format("Partial review" if review_req.state_id == "part-completed" else "Review", review_req.doc.name, review_req.reviewed_rev)
563-
role = request.user.person.role_set.filter(group=review_req.team,name='reviewer').first()
564-
if role and role.email.active:
565-
frm = role.formatted_email()
566-
else:
567-
frm = request.user.person.formatted_email()
568572
related_groups = [ review_req.team, ]
569573
if review_req.doc.group:
570574
related_groups.append(review_req.doc.group)

0 commit comments

Comments
 (0)