Finish charter milestones support so they're merged in after approval

OleLaursen · OleLaursen · commit 319a202900c5 · 2012-06-27T16:24:04.000Z
of the charter, also replace references to WGs in wgcharter with a
more generic counterpart so will be easier to add support for RGs if
someone ever gets that far (will still need testing and probably some
minor adjustments though).
 - Legacy-Id: 4534
diff --git a/ietf/group/utils.py b/ietf/group/utils.py
@@ -12,7 +12,7 @@ def save_group_in_history(group):
 
     # save RoleHistory
     for role in group.role_set.all():
-        rh = RoleHistory(name=role.name, group=grouphist, email=role.email, person=role.person)
+        rh = RoleHistory(name=role.name, group=h, email=role.email, person=role.person)
         rh.save()
 
     copy_many_to_many_for_history(h, group)
diff --git a/ietf/templates/wgcharter/action_text.txt b/ietf/templates/wgcharter/action_text.txt
@@ -1,8 +1,8 @@
 {% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
-To: IETF-Announce <ietf-announce@ietf.org>{% if wg.list_email %}
-Cc: {{ wg.acronym }} WG <{{ wg.list_email }}> {% endif %}
-Subject: WG Action: {{ action_type }} {{ wg.name }} ({{ wg.acronym }})
+To: IETF-Announce <ietf-announce@ietf.org>{% if group.list_email %}
+Cc: {{ group.acronym }} {{ group.type.name }} <{{ group.list_email }}> {% endif %}
+Subject: WG Action: {{ action_type }} {{ group.name }} ({{ group.acronym }})
 
-{% filter wordwrap:73 %}{% ifequal action_type "Formed" %}A new IETF working group has been formed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal action_type "Rechartered" %}The {{ wg.name }} ({{ wg.acronym }}) working group in the {{ wg.parent.name }} of the IETF has been rechartered.{% endifequal %} For additional information please contact the Area Directors or the WG Chair{{ chairs|pluralize}}.
+{% filter wordwrap:73 %}{% ifequal action_type "Formed" %}A new IETF working group has been formed in the {{ group.parent.name }}.{% endifequal %}{% ifequal action_type "Rechartered" %}The {{ group.name }} ({{ group.acronym }}) working group in the {{ group.parent.name }} of the IETF has been rechartered.{% endifequal %} For additional information please contact the Area Directors or the {{ group.type.name }} Chair{{ chairs|pluralize}}.
 
-{% include "wgcharter/wg_info.txt" %}{% endfilter %}{% endautoescape %}
+{% include "wgcharter/group_info.txt" %}{% endfilter %}{% endautoescape %}
diff --git a/ietf/templates/wgcharter/email_secretariat.txt b/ietf/templates/wgcharter/email_secretariat.txt
@@ -1,6 +1,6 @@
 {% load ietf_filters %}{% autoescape off %}
 {{ text|fill:70 }}
 
-WG:      {{ wg_url }}
+{{ group.type.name}}:      {{ group_url }}
 Charter: {{ charter_url }}
 {% endautoescape %}
diff --git a/ietf/templates/wgcharter/group_info.txt b/ietf/templates/wgcharter/group_info.txt
@@ -0,0 +1,28 @@
+{{ group.name }} ({{ group.acronym }})
+------------------------------------------------
+Current Status: {{ group.state.name }} {{ group.type.name }}
+
+{% if chairs %}Chairs:
+{% for r in chairs %}  {{ r.person.plain_name }} <{{r.email.address}}>
+{% endfor %}
+{% endif %}{% if secr %}Secretaries:
+{% for r in secr %}  {{ r.person.plain_name }} <{{r.email.address}}>
+{% endfor %}
+{% endif %}{% if techadv %}Technical advisors:
+{% for r in techadv %}  {{ r.person.plain_name }} <{{r.email.address}}>
+{% endfor %}
+{% endif %}{% if group.ad %}Assigned Area Director:
+  {{ group.ad.plain_name }} <{{ ad_email }}>
+
+{% endif %}{% if group.list_email %}Mailing list
+  Address: {{ group.list_email }}
+  To Subscribe: {{ group.list_subscribe }}
+  Archive: {{ group.list_archive }}
+{% endif %}
+Charter:
+
+{{ charter_text }}
+
+Milestones:
+{% for milestone in milestones %}  {% if milestone.resolved %}{{ milestone.resolved }}    {% else %}{{ milestone.due|date:"M Y" }}{% endif %} - {{ milestone.desc|safe }}
+{% endfor %}
diff --git a/ietf/templates/wgcharter/review_text.txt b/ietf/templates/wgcharter/review_text.txt
@@ -1,8 +1,8 @@
 {% load ietf_filters %}{% autoescape off %}From: The IESG <iesg-secretary@ietf.org>
-To: IETF-Announce <ietf-announce@ietf.org>{% if wg.list_email %}
-Cc: {{ wg.acronym }} WG <{{ wg.list_email }}> {% endif %}
-Subject: WG Review: {{ wg.name }} ({{ wg.acronym }})
+To: IETF-Announce <ietf-announce@ietf.org>{% if group.list_email %}
+Cc: {{ group.acronym }} {{ group.type.name }} <{{ group.list_email }}> {% endif %}
+Subject: WG Review: {{ group.name }} ({{ group.acronym }})
 
-{% filter wordwrap:73 %}{% ifequal review_type "new" %}A new IETF working group has been proposed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal review_type "recharter" %}The {{ wg.name }} ({{wg.acronym}}) working group in the {{ wg.parent.name }} of the IETF is undergoing rechartering.{% endifequal %} The IESG 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 IESG mailing list (iesg at ietf.org) by {{ review_date }}.
+{% filter wordwrap:73 %}{% ifequal review_type "new" %}A new IETF working group has been proposed in the {{ group.parent.name }}.{% endifequal %}{% ifequal review_type "recharter" %}The {{ group.name }} ({{group.acronym}}) working group in the {{ group.parent.name }} of the IETF is undergoing rechartering.{% endifequal %} The IESG 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 IESG mailing list (iesg at ietf.org) by {{ review_date }}.
 
-{% include "wgcharter/wg_info.txt" %}{% endfilter %}{% endautoescape %}
+{% include "wgcharter/group_info.txt" %}{% endfilter %}{% endautoescape %}
diff --git a/ietf/templates/wgcharter/search_result_row.html b/ietf/templates/wgcharter/search_result_row.html
diff --git a/ietf/templates/wgcharter/submit.html b/ietf/templates/wgcharter/submit.html
@@ -8,13 +8,13 @@
 {% endblock %}
 
 {% block title %}
-Charter submission for {{ wg.acronym }}
+Charter submission for {{ group.acronym }} {{ group.type.name }}
 {% endblock %}
 
 {% block content %}
-<h1>Charter submission for {{ wg.acronym }}</h1>
+<h1>Charter submission for {{ group.acronym }} {{ group.type.name }}</h1>
 
-<p>The text will be submitted as <strong>charter-ietf-{{ wg.acronym }}-{{ next_rev }}</strong></p>
+<p>The text will be submitted as <strong>charter-ietf-{{ group.acronym }}-{{ next_rev }}</strong></p>
 <form class="edit-info" action="" enctype="multipart/form-data" method="POST">
   <table>
     {% for field in form.visible_fields %}
@@ -30,7 +30,7 @@ <h1>Charter submission for {{ wg.acronym }}</h1>
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=wg.charter.name %}">Back</a>
+        <a href="{% url doc_view name=group.charter.name %}">Back</a>
         <input type="submit" value="Submit"/>
       </td>
     </tr>
diff --git a/ietf/templates/wgcharter/wg_info.txt b/ietf/templates/wgcharter/wg_info.txt
diff --git a/ietf/wgcharter/mails.py b/ietf/wgcharter/mails.py
@@ -13,7 +13,7 @@
 from ietf.person.models import Person
 from ietf.wgcharter.utils import *
 
-def email_secretariat(request, wg, type, text):
+def email_secretariat(request, group, type, text):
     to = ["iesg-secretary@ietf.org"]
 
     types = {}
@@ -24,16 +24,16 @@ def email_secretariat(request, wg, type, text):
     types['state-extrev'] = "State changed to External review"
     types['state-iesgrev'] = "State changed to IESG review"
     types['state-approved'] = "Charter approved"
-    types['conclude'] = "Request closing of WG"
+    types['conclude'] = "Request closing of group"
 
-    subject = u"Regarding WG %s: %s" % (wg.acronym, types[type])
+    subject = u"Regarding %s %s: %s" % (group.type.name, group.acronym, types[type])
     
     text = strip_tags(text)
     send_mail(request, to, None, subject,
               "wgcharter/email_secretariat.txt",
               dict(text=text,
-                   wg_url=settings.IDTRACKER_BASE_URL + urlreverse('wg_charter', kwargs=dict(acronym=wg.acronym)),
-                   charter_url=settings.IDTRACKER_BASE_URL + urlreverse('doc_view', kwargs=dict(name=wg.charter.name)),
+                   group_url=settings.IDTRACKER_BASE_URL + urlreverse('wg_charter', kwargs=dict(acronym=group.acronym)),
+                   charter_url=settings.IDTRACKER_BASE_URL + urlreverse('doc_view', kwargs=dict(name=group.charter.name)),
                    )
               )
 
@@ -62,47 +62,47 @@ def generate_ballot_writeup(request, doc):
     
     return e
 
-def default_action_text(wg, charter, user):
-    if next_approved_revision(wg.charter.rev) == "01":
+def default_action_text(group, charter, user):
+    if next_approved_revision(group.charter.rev) == "01":
         action = "Formed"
     else:
         action = "Rechartered"
 
     e = WriteupDocEvent(doc=charter, by=user)
     e.by = user
     e.type = "changed_action_announcement"
-    e.desc = "WG action text was changed"
+    e.desc = "%s action text was changed" % group.type.name
     e.text = render_to_string("wgcharter/action_text.txt",
-                              dict(wg=wg,
+                              dict(group=group,
                                    charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
                                    charter_text=read_charter_text(charter),
-                                   chairs=wg.role_set.filter(name="chair"),
-                                   secr=wg.role_set.filter(name="secr"),
-                                   techadv=wg.role_set.filter(name="techadv"),
-                                   milestones=wg.groupmilestone_set.all(),
-                                   ad_email=wg.ad.role_email("ad") if wg.ad else None,
+                                   chairs=group.role_set.filter(name="chair"),
+                                   secr=group.role_set.filter(name="secr"),
+                                   techadv=group.role_set.filter(name="techadv"),
+                                   milestones=group.groupmilestone_set.filter(state="charter"),
+                                   ad_email=group.ad.role_email("ad") if group.ad else None,
                                    action_type=action,
                                    ))
 
     e.save()
     return e
 
-def default_review_text(wg, charter, user):
+def default_review_text(group, charter, user):
     e = WriteupDocEvent(doc=charter, by=user)
     e.by = user
     e.type = "changed_review_announcement"
-    e.desc = "WG review text was changed"
+    e.desc = "%s review text was changed" % group.type.name
     e.text = render_to_string("wgcharter/review_text.txt",
-                              dict(wg=wg,
+                              dict(group=group,
                                    charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
                                    charter_text=read_charter_text(charter),
-                                   chairs=wg.role_set.filter(name="chair"),
-                                   secr=wg.role_set.filter(name="secr"),
-                                   techadv=wg.role_set.filter(name="techadv"),
-                                   milestones=wg.groupmilestone_set.all(),
-                                   ad_email=wg.ad.role_email("ad") if wg.ad else None,
+                                   chairs=group.role_set.filter(name="chair"),
+                                   secr=group.role_set.filter(name="secr"),
+                                   techadv=group.role_set.filter(name="techadv"),
+                                   milestones=group.groupmilestone_set.filter(state="charter"),
+                                   ad_email=group.ad.role_email("ad") if group.ad else None,
                                    review_date=(datetime.date.today() + datetime.timedelta(weeks=1)).isoformat(),
-                                   review_type="new" if wg.state_id == "proposed" else "recharter",
+                                   review_type="new" if group.state_id == "proposed" else "recharter",
                                    )
                               )
     e.save()
diff --git a/ietf/wgcharter/tests.py b/ietf/wgcharter/tests.py
@@ -174,7 +174,7 @@ def test_submit_charter(self):
             self.assertEquals(f.read(),
                               "Windows line\nMac line\nUnix line\n" + utf_8_snippet)
 
-class CharterApproveBallotTestCase(django.test.TestCase):
+class ApproveCharterTestCase(django.test.TestCase):
     fixtures = ['names']
 
     def setUp(self):
@@ -209,6 +209,28 @@ def test_approve(self):
 
         charter.set_state(State.objects.get(type="charter", slug="iesgrev"))
 
+        due_date = datetime.date.today() + datetime.timedelta(days=180)
+        m1 = GroupMilestone.objects.create(group=group,
+                                           state_id="active",
+                                           desc="Has been copied",
+                                           due=due_date,
+                                           resolved="")
+        m2 = GroupMilestone.objects.create(group=group,
+                                           state_id="active",
+                                           desc="To be deleted",
+                                           due=due_date,
+                                           resolved="")
+        m3 = GroupMilestone.objects.create(group=group,
+                                           state_id="charter",
+                                           desc="Has been copied",
+                                           due=due_date,
+                                           resolved="")
+        m4 = GroupMilestone.objects.create(group=group,
+                                           state_id="charter",
+                                           desc="New charter milestone",
+                                           due=due_date,
+                                           resolved="")
+
         # normal get
         r = self.client.get(url)
         self.assertEquals(r.status_code, 200)
@@ -232,3 +254,8 @@ def test_approve(self):
         self.assertEquals(len(outbox), mailbox_before + 2)
         self.assertTrue("WG Action" in outbox[-1]['Subject'])
         self.assertTrue("Charter approved" in outbox[-2]['Subject'])
+
+        self.assertEquals(group.groupmilestone_set.filter(state="charter").count(), 0)
+        self.assertEquals(group.groupmilestone_set.filter(state="active").count(), 2)
+        self.assertEquals(group.groupmilestone_set.filter(state="active", desc=m1.desc).count(), 1)
+        self.assertEquals(group.groupmilestone_set.filter(state="active", desc=m4.desc).count(), 1)
diff --git a/ietf/wgcharter/views.py b/ietf/wgcharter/views.py
diff --git a/ietf/wginfo/milestones.py b/ietf/wginfo/milestones.py
