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

Merged in [17286] from rjsparks@nostrum.com:

Browse source 
Add Reply-To to the default group review text. Fixes #2883.
 - Legacy-Id: 17292
Note: SVN reference [17286] has been migrated to Git commit 7e09dea02c
This commit is contained in:
Henrik Levkowetz 2020-02-13 00:33:37 +00:00
parent 5e6ea5b2e8 7e09dea02c
commit 0a6260cf16
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ietf/doc/tests_charter.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright The IETF Trust 2011-2019, All Rights Reserved
# Copyright The IETF Trust 2011-2020, All Rights Reserved
from __future__ import absolute_import, print_function, unicode_literals
@ -531,9 +531,13 @@ class EditCharterTests(TestCase):
send_both="1"))
self.assertEqual(len(outbox), 2)
self.assertTrue(all(['WG Review' in m['Subject'] for m in outbox]))
self.assertTrue('ietf-announce@' in outbox[0]['To'])
self.assertTrue('mars-wg@' in outbox[0]['Cc'])
self.assertTrue('new-work@' in outbox[1]['To'])
self.assertIn('ietf-announce@', outbox[0]['To'])
self.assertIn('mars-wg@', outbox[0]['Cc'])
self.assertIn('new-work@', outbox[1]['To'])
self.assertIsNotNone(outbox[0]['Reply-To'])
self.assertIsNotNone(outbox[1]['Reply-To'])
self.assertIn('iesg@ietf.org', outbox[0]['Reply-To'])
self.assertIn('iesg@ietf.org', outbox[1]['Reply-To'])
empty_outbox()
r = self.client.post(url, dict(

1
ietf/templates/doc/charter/review_text.txt
View file

@ -1,6 +1,7 @@
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
To: {{ to }}{% if cc %}
Cc: {{ cc }} {% endif %}
Reply-To: iesg@ietf.org
Subject: {{ group.type.name }} Review: {{ group.name }} ({{ group.acronym }})
{% filter wordwrap:78 %}{% if review_type == "new" %}A new {% if group.type_id == "rg" %}IRTF{% else %}IETF{% endif %} {{ group.type.name }} has been proposed in the {{ group.parent.name }}.{% elif review_type == "recharter" %}The {{ group.name }} ({{group.acronym}}) {{ group.type.name }} in the {{ group.parent.name }} of the {% if group.type_id == "rg" %}IRTF{% else %}IETF{% endif %} is undergoing rechartering.{% endif %} The {% if group.type_id == "rg" %}IRSG{% else %}IESG{% endif %} has not made any determination yet. The following draft charter was submitted, and is provided for informational purposes only. Please send your comments to the {% if group.type_id == "rg" %}IRSG{% else %}IESG{% endif %} mailing list ({% if group.type_id == "rg" %}irsg@irtf.org{% else %}iesg@ietf.org{% endif %}) by {{ review_date }}.