Make a more appropriate review message when a BoF has an initial charter under consideration. Fixes ietf-tools#2458. Commit ready for merge.

 - Legacy-Id: 14715

Author: rjsparks

ietf/doc/tests_charter.py

@@ -10,11 +10,13 @@
 
 import debug                            # pyflakes:ignore
 
+from ietf.doc.factories import DocumentFactory
 from ietf.doc.models import ( Document, State, BallotDocEvent, BallotType, NewRevisionDocEvent,
     TelechatDocEvent, WriteupDocEvent )
 from ietf.doc.utils_charter import ( next_revision, default_review_text, default_action_text,
     charter_name_for_group )
 from ietf.doc.utils import close_open_ballots
+from ietf.group.factories import RoleFactory
 from ietf.group.models import Group, GroupMilestone
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
@@ -665,3 +667,9 @@ def test_charter_with_milestones(self):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertTrue(m.desc in unicontent(r))
+
+    def test_chartering_from_bof(self):
+        ad_role = RoleFactory(group__type_id='area',name_id='ad')
+        charter = DocumentFactory(type_id='charter',group__type_id='wg',group__state_id='bof',group__parent=ad_role.group)
+        e1,_ = default_review_text(charter.group, charter, Person.objects.get(name="(System)"))
+        self.assertTrue('A new IETF WG has been proposed' in e1.text)

ietf/doc/utils_charter.py

@@ -207,7 +207,7 @@ def default_review_text(group, charter, by):
                                     techadv=group.role_set.filter(name="techadv"),
                                     milestones=group.groupmilestone_set.filter(state="charter"),
                                     review_date=(datetime.date.today() + datetime.timedelta(weeks=1)).isoformat(),
-                                    review_type="new" if group.state_id == "proposed" else "recharter",
+                                    review_type="new" if group.state_id in ["proposed","bof"] else "recharter",
                                     to=addrs.to,
                                     cc=addrs.cc,
                                    )