Skip to content

Commit 0a6260c

Browse files
committed
Merged in [17286] from rjsparks@nostrum.com:
Add Reply-To to the default group review text. Fixes ietf-tools#2883. - Legacy-Id: 17292 Note: SVN reference [17286] has been migrated to Git commit 7e09dea
2 parents 5e6ea5b + 7e09dea commit 0a6260c

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

ietf/doc/tests_charter.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# Copyright The IETF Trust 2011-2019, All Rights Reserved
2+
# Copyright The IETF Trust 2011-2020, All Rights Reserved
33

44

55
from __future__ import absolute_import, print_function, unicode_literals
@@ -531,9 +531,13 @@ def test_edit_review_announcement_text(self):
531531
send_both="1"))
532532
self.assertEqual(len(outbox), 2)
533533
self.assertTrue(all(['WG Review' in m['Subject'] for m in outbox]))
534-
self.assertTrue('ietf-announce@' in outbox[0]['To'])
535-
self.assertTrue('mars-wg@' in outbox[0]['Cc'])
536-
self.assertTrue('new-work@' in outbox[1]['To'])
534+
self.assertIn('ietf-announce@', outbox[0]['To'])
535+
self.assertIn('mars-wg@', outbox[0]['Cc'])
536+
self.assertIn('new-work@', outbox[1]['To'])
537+
self.assertIsNotNone(outbox[0]['Reply-To'])
538+
self.assertIsNotNone(outbox[1]['Reply-To'])
539+
self.assertIn('iesg@ietf.org', outbox[0]['Reply-To'])
540+
self.assertIn('iesg@ietf.org', outbox[1]['Reply-To'])
537541

538542
empty_outbox()
539543
r = self.client.post(url, dict(

ietf/templates/doc/charter/review_text.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
22
To: {{ to }}{% if cc %}
33
Cc: {{ cc }} {% endif %}
4+
Reply-To: iesg@ietf.org
45
Subject: {{ group.type.name }} Review: {{ group.name }} ({{ group.acronym }})
56

67
{% 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 }}.

0 commit comments

Comments
 (0)