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

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

Browse source 
Make the internal review message reflect whether this is a new chartering effort or a recharter. Fixes #1814.
 - Legacy-Id: 10406
Note: SVN reference [10378] has been migrated to Git commit ff93fe3599
This commit is contained in:
Henrik Levkowetz 2015-11-03 13:49:21 +00:00
parent 5f2773fd8f ff93fe3599
commit be491ac1a0
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ietf/doc/mails.py
View file

@ -473,6 +473,7 @@ def email_charter_internal_review(request, charter):
ads=charter.group.role_set.filter(name='ad').values_list('person__name',flat=True), ads=charter.group.role_set.filter(name='ad').values_list('person__name',flat=True),
charter_text=charter_text, charter_text=charter_text,
milestones=charter.group.groupmilestone_set.filter(state="charter"), milestones=charter.group.groupmilestone_set.filter(state="charter"),
review_type = "new" if charter.group.state_id == "proposed" else "recharter",
), ),
cc=addrs.cc, cc=addrs.cc,
extra={'Reply-To':"iesg@ietf.org"}, extra={'Reply-To':"iesg@ietf.org"},

10
ietf/doc/tests_charter.py
View file

@ -102,12 +102,22 @@ class EditCharterTests(TestCase):
if slug=="intrev": if slug=="intrev":
self.assertTrue("Internal WG Review" in outbox[-3]['Subject']) self.assertTrue("Internal WG Review" in outbox[-3]['Subject'])
self.assertTrue(all([x in outbox[-3]['To'] for x in ['iab@','iesg@']])) self.assertTrue(all([x in outbox[-3]['To'] for x in ['iab@','iesg@']]))
self.assertTrue("A new IETF working" in unicode(outbox[-3]))
self.assertTrue("state changed" in outbox[-2]['Subject'].lower()) self.assertTrue("state changed" in outbox[-2]['Subject'].lower())
self.assertTrue("iesg-secretary@" in outbox[-2]['To']) self.assertTrue("iesg-secretary@" in outbox[-2]['To'])
self.assertTrue("State Update Notice" in outbox[-1]['Subject']) self.assertTrue("State Update Notice" in outbox[-1]['Subject'])
self.assertTrue("ames-chairs@" in outbox[-1]['To']) self.assertTrue("ames-chairs@" in outbox[-1]['To'])
# Exercise internal review of a recharter
group = Group.objects.get(acronym="mars")
charter = group.charter
url = urlreverse('charter_change_state', kwargs=dict(name=charter.name))
empty_outbox()
r = self.client.post(url, dict(charter_state=str(State.objects.get(used=True,type="charter",slug="intrev").pk), message="test"))
self.assertEqual(r.status_code, 302)
self.assertTrue("A new charter" in unicode(outbox[-3]))
def test_edit_telechat_date(self): def test_edit_telechat_date(self):
make_test_data() make_test_data()

2
ietf/templates/doc/mail/charter_internal_review.txt
View file

@ -1,6 +1,6 @@
{% autoescape off %}{% filter wordwrap:73 %} {% autoescape off %}{% filter wordwrap:73 %}
A new IETF working group is being considered in the {{charter.group.parent.name}}. The draft charter for this working group is provided below for your review and comment. {% if review_type == "new" %}A new IETF working group is being considered in the {{ charter.group.parent.name }}.{% endif %}{% if review_type == "recharter" %}A new charter for the {{ charter.group.name }} ({{charter.group.acronym}}) working group in the {{ charter.group.parent.name }} of the IETF is being considered. {% endif %} The draft charter for this working group is provided below for your review and comment.
Review time is one week. Review time is one week.