altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [10425] from bartosz.balazinski@interdigital.com:

Browse source 
Provide information about who has suggested document replaced-by information in the notification email.

    This commit fixes bug 1817,
 - Legacy-Id: 10440
Note: SVN reference [10425] has been migrated to Git commit ba39077180
This commit is contained in:
Henrik Levkowetz 2015-11-07 21:43:27 +00:00
parent 95a001333b ba39077180
commit 408d51c11f
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ietf/doc/mails.py
View file

@ -437,7 +437,7 @@ def email_stream_tags_changed(request, doc, added_tags, removed_tags, by, commen
comment=comment), comment=comment),
cc=cc) cc=cc)
def send_review_possibly_replaces_request(request, doc): def send_review_possibly_replaces_request(request, doc, submitter_info):
addrs = gather_address_lists('doc_replacement_suggested',doc=doc) addrs = gather_address_lists('doc_replacement_suggested',doc=doc)
to = set(addrs.to) to = set(addrs.to)
cc = set(addrs.cc) cc = set(addrs.cc)
@ -452,6 +452,7 @@ def send_review_possibly_replaces_request(request, doc):
'Review of suggested possible replacements for %s-%s needed' % (doc.name, doc.rev), 'Review of suggested possible replacements for %s-%s needed' % (doc.name, doc.rev),
'doc/mail/review_possibly_replaces_request.txt', 'doc/mail/review_possibly_replaces_request.txt',
dict(doc= doc, dict(doc= doc,
submitter_info=submitter_info,
possibly_replaces=doc.related_that_doc("possibly-replaces"), possibly_replaces=doc.related_that_doc("possibly-replaces"),
review_url=settings.IDTRACKER_BASE_URL + urlreverse("doc_review_possibly_replaces", kwargs={ "name": doc.name })), review_url=settings.IDTRACKER_BASE_URL + urlreverse("doc_review_possibly_replaces", kwargs={ "name": doc.name })),
cc=list(cc),) cc=list(cc),)

4
ietf/submit/utils.py
View file

@ -168,8 +168,10 @@ def post_submission(request, submission):
submitter_parsed = submission.submitter_parsed() submitter_parsed = submission.submitter_parsed()
if submitter_parsed["name"] and submitter_parsed["email"]: if submitter_parsed["name"] and submitter_parsed["email"]:
submitter = ensure_person_email_info_exists(submitter_parsed["name"], submitter_parsed["email"]).person submitter = ensure_person_email_info_exists(submitter_parsed["name"], submitter_parsed["email"]).person
submitter_info = u'%s <%s>' % (submitter_parsed["name"], submitter_parsed["email"])
else: else:
submitter = system submitter = system
submitter_info = system.name
draft.set_state(State.objects.get(used=True, type="draft", slug="active")) draft.set_state(State.objects.get(used=True, type="draft", slug="active"))
DocAlias.objects.get_or_create(name=submission.name, document=draft) DocAlias.objects.get_or_create(name=submission.name, document=draft)
@ -226,7 +228,7 @@ def post_submission(request, submission):
announce_to_authors(request, submission) announce_to_authors(request, submission)
if new_possibly_replaces: if new_possibly_replaces:
send_review_possibly_replaces_request(request, draft) send_review_possibly_replaces_request(request, draft, submitter_info)
submission.save() submission.save()

4
ietf/templates/doc/mail/review_possibly_replaces_request.txt
View file

@ -1,4 +1,6 @@
{% autoescape off %} {% autoescape off %}
{{ submitter_info }} has suggested new replaced-by information:
{{ doc }} is suggested to replace: {{ doc }} is suggested to replace:
{% for d in possibly_replaces %} {{ d.name }} {% for d in possibly_replaces %} {{ d.name }}
@ -8,5 +10,5 @@ Please visit
{{ review_url }} {{ review_url }}
and either accept or decline the suggestion{{ suggested_replaces|pluralize:"s" }}. and either accept or decline the suggestion.
{% endautoescape %} {% endautoescape %}