Added view for preparing the last call/editing writeups, for making last call (for Secretariat) and for approving a ballot (for Secretariat)

 - Legacy-Id: 2286

Author: OleLaursen

branch/iesg-tracker/ietf/idrfc/mails.py

@@ -6,7 +6,7 @@
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 
-from ietf.utils.mail import send_mail
+from ietf.utils.mail import send_mail, send_mail_text
 from ietf.idtracker.models import *
 
 def email_state_changed(request, doc, text):
@@ -77,7 +77,7 @@ def generate_last_call_announcement(request, doc):
     return render_to_string("idrfc/last_call_announcement.txt",
                             dict(doc=doc,
                                  doc_url=request.build_absolute_uri(doc.idinternal.get_absolute_url()),
-                                 expiration_date=expiration_date.strftime("%B %-d, %Y"),
+                                 expiration_date=expiration_date.strftime("%Y-%m-%d"), #.strftime("%B %-d, %Y"),
                                  cc=", ".join("<%s>" % e for e in cc),
                                  group=group,
                                  docs=docs,
@@ -136,7 +136,7 @@ def generate_approval_mail(request, doc):
     return render_to_string("idrfc/approval_mail.txt",
                             dict(doc=doc,
                                  doc_url=request.build_absolute_uri(doc.idinternal.get_absolute_url()),
-                                 cc=", ".join(cc),
+                                 cc=",\n    ".join(cc),
                                  docs=docs,
                                  doc_type=doc_type,
                                  made_by=made_by,
@@ -147,7 +147,6 @@ def generate_approval_mail(request, doc):
                             )
 
 def generate_approval_mail_rfc_editor(request, doc):
-    # FIXME: need unit test for this function
     full_status = full_intended_status(doc.intended_status)
     status = full_status.replace("a ", "").replace("an ", "")
     disapproved = doc.idinternal.cur_state_id in IDState.DO_NOT_PUBLISH_STATES
@@ -193,3 +192,25 @@ def email_ballot_deferred(request, doc, by, telechat_date):
               dict(doc=doc,
                    by=by,
                    telechat_date=telechat_date))
+
+def email_ballot(request, doc):
+    to = "iesg@ietf.org"
+    # FIXME: fill in
+
+def email_iana(request, doc, to, msg):
+    # fix up message and send message to IANA for each in ballot set
+    import email
+    parsed_msg = email.message_from_string(msg.encode("utf-8"))
+
+    for i in doc.idinternal.ballot_set():
+        extra = {}
+        extra["Reply-To"] = "noreply@ietf.org"
+        extra["X-IETF-Draft-string"] = i.document().filename
+        extra["X-IETF-Draft-revision"] = i.document().revision_display()
+    
+        send_mail_text(request, "To: IANA <%s>" % to,
+                       parsed_msg["From"], parsed_msg["Subject"],
+                       parsed_msg.get_payload(),
+                       extra=extra,
+                       bcc="fenner@research.att.com")
+

branch/iesg-tracker/ietf/idrfc/tests.py

@@ -368,7 +368,70 @@ def test_undefer_ballot(self):
 
         draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
         self.assertTrue(not draft.idinternal.ballot.defer)
-        self.assertTrue(draft.idinternal.cur_state_id == IDState.IESG_EVALUATION)
+        self.assertEquals(draft.idinternal.cur_state_id, IDState.IESG_EVALUATION)
+
+class ApproveBallotTestCase(django.test.TestCase):
+    fixtures = ['base', 'draft', 'ballot']
+
+    def test_approve_ballot(self):
+        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+        url = urlreverse('doc_approve_ballot', kwargs=dict(name=draft.filename))
+        login_testing_unauthorized(self, "klm", url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue("Send out the announcement" in q('input[type=submit]')[0].get('value'))
+        self.assertEquals(len(q('pre')), 1)
+
+        # approve
+        mailbox_before = len(mail_outbox)
+        
+        r = self.client.post(url, dict())
+        self.assertEquals(r.status_code, 302)
+
+        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+        self.assertEquals(draft.idinternal.cur_state_id, IDState.APPROVED_ANNOUNCEMENT_SENT)
+        
+        self.assertEquals(len(mail_outbox), mailbox_before + 4)
+
+        self.assertTrue("Protocol Action" in mail_outbox[-2]['Subject'])
+        # the IANA copy
+        self.assertTrue("Protocol Action" in mail_outbox[-1]['Subject'])
+
+class MakeLastCallTestCase(django.test.TestCase):
+    fixtures = ['base', 'draft', 'ballot']
+
+    def test_make_last_call(self):
+        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+        url = urlreverse('doc_make_last_call', kwargs=dict(name=draft.filename))
+        login_testing_unauthorized(self, "klm", url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEquals(len(q('input[name=last_call_sent_date]')), 1)
+
+        # make last call
+        mailbox_before = len(mail_outbox)
+        
+        r = self.client.post(url,
+                             dict(last_call_sent_date=q('input[name=last_call_sent_date]')[0].get("value"),
+                                  last_call_expiration_date=q('input[name=last_call_expiration_date]')[0].get("value")
+                                  ))
+        self.assertEquals(r.status_code, 302)
+
+        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+        self.assertEquals(draft.idinternal.cur_state_id, IDState.IN_LAST_CALL)
+        
+        self.assertEquals(len(mail_outbox), mailbox_before + 4)
+
+        self.assertTrue("Last Call" in mail_outbox[-4]['Subject'])
+        # the IANA copy
+        self.assertTrue("Last Call" in mail_outbox[-3]['Subject'])
+
 
 
 TEST_RFC_INDEX = '''<?xml version="1.0" encoding="UTF-8"?>

branch/iesg-tracker/ietf/idrfc/urls.py

@@ -38,17 +38,20 @@
     (r'^search/$', views_search.search_results),
     (r'^all/$', views_search.all),
     (r'^active/$', views_search.active),
-    url(r'^(?P<name>[^/]+)/$', views_doc.document_main, {}, name="doc_view"),
+    url(r'^(?P<name>[^/]+)/$', views_doc.document_main, name="doc_view"),
     (r'^(?P<name>[^/]+)/_debug.data$', views_doc.document_debug),
     (r'^(?P<name>[^/]+)/_ballot.data$', views_doc.document_ballot),
     (r'^ad/(?P<name>[^/]+)/$', views_search.by_ad),
 
-    url(r'^(?P<name>[^/]+)/edit/state/$', views_edit.change_state, {}, name='doc_change_state'),
-    url(r'^(?P<name>[^/]+)/edit/info/$', views_edit.edit_info, {}, name='doc_edit_info'),
-    url(r'^(?P<name>[^/]+)/edit/resurrect/$', views_edit.request_resurrect, {}, name='doc_request_resurrect'),
-    url(r'^(?P<name>[^/]+)/edit/addcomment/$', views_edit.add_comment, {}, name='doc_add_comment'),
-    url(r'^(?P<name>[^/]+)/edit/position/$', views_ballot.edit_position, {}, name='doc_edit_position'),
-    url(r'^(?P<name>[^/]+)/edit/deferballot/$', views_ballot.defer_ballot, {}, name='doc_defer_ballot'),
-    url(r'^(?P<name>[^/]+)/edit/undeferballot/$', views_ballot.undefer_ballot, {}, name='doc_undefer_ballot'),
-    url(r'^(?P<name>[^/]+)/edit/sendballotcomment/$', views_ballot.send_ballot_comment, {}, name='doc_send_ballot_comment'),
+    url(r'^(?P<name>[^/]+)/edit/state/$', views_edit.change_state, name='doc_change_state'),
+    url(r'^(?P<name>[^/]+)/edit/info/$', views_edit.edit_info, name='doc_edit_info'),
+    url(r'^(?P<name>[^/]+)/edit/resurrect/$', views_edit.request_resurrect, name='doc_request_resurrect'),
+    url(r'^(?P<name>[^/]+)/edit/addcomment/$', views_edit.add_comment, name='doc_add_comment'),
+    url(r'^(?P<name>[^/]+)/edit/position/$', views_ballot.edit_position, name='doc_edit_position'),
+    url(r'^(?P<name>[^/]+)/edit/deferballot/$', views_ballot.defer_ballot, name='doc_defer_ballot'),
+    url(r'^(?P<name>[^/]+)/edit/undeferballot/$', views_ballot.undefer_ballot, name='doc_undefer_ballot'),
+    url(r'^(?P<name>[^/]+)/edit/sendballotcomment/$', views_ballot.send_ballot_comment, name='doc_send_ballot_comment'),
+    url(r'^(?P<name>[^/]+)/edit/preparelastcall/$', views_ballot.prepare_last_call, name='doc_prepare_last_call'),
+    url(r'^(?P<name>[^/]+)/edit/approveballot/$', views_ballot.approve_ballot, name='doc_approve_ballot'),
+    url(r'^(?P<name>[^/]+)/edit/makelastcall/$', views_ballot.make_last_call, name='doc_make_last_call'),
 )

branch/iesg-tracker/ietf/idrfc/utils.py

@@ -17,23 +17,28 @@ def add_document_comment(request, doc, text, include_by=True, ballot=None):
     c.rfc_flag = doc.idinternal.rfc_flag
     c.save()
 
+def generate_ballot(request, doc):
+    ballot = BallotInfo()
+    ballot.ballot = doc.idinternal.ballot_id
+    ballot.active = False
+    ballot.last_call_text = generate_last_call_announcement(request, doc)
+    ballot.approval_text = generate_approval_mail(request, doc)
+    ballot.ballot_writeup = render_to_string("idrfc/ballot_writeup.txt")
+    ballot.save()
+    doc.idinternal.ballot = ballot
+    return ballot
+    
 def make_last_call(request, doc):
     try:
         ballot = doc.idinternal.ballot
     except BallotInfo.DoesNotExist:
-        ballot = BallotInfo()
-        ballot.ballot = doc.idinternal.ballot_id
-        ballot.active = False
-        ballot.last_call_text = generate_last_call_announcement(request, doc)
-        ballot.approval_text = generate_approval_mail(request, doc)
-        ballot.ballot_writeup = render_to_string("idrfc/ballot_writeup.txt")
-        ballot.save()
+        ballot = generate_ballot(request, doc)
 
     send_last_call_request(request, doc, ballot)
     add_document_comment(request, doc, "Last Call was requested")
 
 def log_state_changed(request, doc, by):
-    change = u"State changed to <b>%s</b> from <b>%s</b> by <b>%s</b>" % (
+    change = u"State changed to <b>%s</b> from <b>%s</b> by %s" % (
         doc.idinternal.docstate(),
         format_document_state(doc.idinternal.prev_state, doc.
                               idinternal.prev_sub_state),
@@ -53,3 +58,5 @@ def log_state_changed(request, doc, by):
     email_state_changed(request, doc, strip_tags(change))
 
     return change
+
+