From 7e09dea02cdb982990b846497f68b01226241afd Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Tue, 11 Feb 2020 15:39:20 +0000 Subject: [PATCH] Add Reply-To to the default group review text. Fixes #2883. Commit ready for merge. - Legacy-Id: 17286 --- ietf/doc/tests_charter.py | 6 +++++- ietf/templates/doc/charter/review_text.txt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py index cf7e971aa..149e4349c 100644 --- a/ietf/doc/tests_charter.py +++ b/ietf/doc/tests_charter.py @@ -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 @@ -534,6 +534,10 @@ class EditCharterTests(TestCase): 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.assertIsNotNone(outbox[0]['Reply-To']) + self.assertIsNotNone(outbox[1]['Reply-To']) + self.assertTrue('iesg@ietf.org' in outbox[0]['Reply-To']) + self.assertTrue('iesg@ietf.org' in outbox[1]['Reply-To']) empty_outbox() r = self.client.post(url, dict( diff --git a/ietf/templates/doc/charter/review_text.txt b/ietf/templates/doc/charter/review_text.txt index 5fb98f059..2693a2a5d 100644 --- a/ietf/templates/doc/charter/review_text.txt +++ b/ietf/templates/doc/charter/review_text.txt @@ -1,6 +1,7 @@ {% load ietf_filters %}{% autoescape off %}From: The IESG 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 }}.