View for sending ballot discuss and comment to the IESG list

 - Legacy-Id: 2277

Author: OleLaursen

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

@@ -288,11 +288,31 @@ def test_edit_position(self):
         self.assertTrue(not (pos.yes or pos.abstain or pos.recuse))
         self.assertTrue(pos.discuss == -1)
         self.assertEquals(draft.idinternal.comments().count(), comments_before + 1)
-        self.assertTrue("Position" in draft.idinternal.comments()[0].comment_text)        
+        self.assertTrue("Position" in draft.idinternal.comments()[0].comment_text)
 
-        #self.assertTrue(len(mail_outbox) == 1)
-        #self.assertTrue("updated" in mail_outbox[0]['Subject'])
-        #self.assertTrue(draft.filename in mail_outbox[0]['Subject'])
+    def test_send_ballot_comment(self):
+        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+        url = urlreverse('doc_send_ballot_comment', kwargs=dict(name=draft.filename))
+        login_as = "rhousley"
+        login_testing_unauthorized(self, login_as, url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(len(q('form input[name="cc"]')) > 0)
+
+        # send
+        IESGComment.objects.create(ballot=draft.idinternal.ballot,
+                                   ad=IESGLogin.objects.get(login_name=login_as),
+                                   text="Test!", date=date.today(),
+                                   revision=draft.revision_display(), active=1)
+        
+        r = self.client.post(url, dict(cc="test@example.com", cc_state_change="1"))
+        self.assertEquals(r.status_code, 302)
+
+        self.assertTrue(len(mail_outbox) == 1)
+        self.assertTrue("COMMENT" in mail_outbox[0]['Subject'])
 
 
 TEST_RFC_INDEX = '''<?xml version="1.0" encoding="UTF-8"?>

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

@@ -48,4 +48,5 @@
     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_edit.edit_position, {}, name='doc_edit_position'),
+    url(r'^(?P<name>[^/]+)/edit/sendballotcomment/$', views_edit.send_ballot_comment, {}, name='doc_send_ballot_comment'),                       
 )

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

@@ -2,11 +2,13 @@
 from datetime import datetime, date, time, timedelta
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, get_object_or_404
+from django.core.urlresolvers import reverse as urlreverse
 from django.template.loader import render_to_string
 from django.template import RequestContext
 from django import forms
 from django.utils.html import strip_tags
 
+from ietf.utils.mail import send_mail_text
 from ietf.ietfauth.decorators import group_required
 from ietf.idtracker.templatetags.ietf_filters import in_group
 from ietf.idtracker.models import *
@@ -356,7 +358,16 @@ def position_to_ballot_choice(position):
 
 def position_label(position_value):
     return dict(BALLOT_CHOICES).get(position_value, "")
-    
+
+def get_ballot_info(ballot, area_director):
+    pos = Position.objects.filter(ballot=ballot, ad=area_director)
+    pos = pos[0] if pos else None
+    discuss = IESGDiscuss.objects.filter(ballot=ballot, ad=area_director)
+    discuss = discuss[0] if discuss else None
+    comment = IESGComment.objects.filter(ballot=ballot, ad=area_director)
+    comment = comment[0] if comment else None
+    return (pos, discuss, comment)
+
 class EditPositionForm(forms.Form):
     position = forms.ChoiceField(choices=BALLOT_CHOICES, widget=forms.RadioSelect)
     discuss_text = forms.CharField(required=False, widget=forms.Textarea)
@@ -370,16 +381,7 @@ def edit_position(request, name):
 
     login = IESGLogin.objects.get(login_name=request.user.username)
 
-    pos = Position.objects.filter(ballot=doc.idinternal.ballot, ad=login)
-    if pos:
-        pos = pos[0]
-            
-    discuss = IESGDiscuss.objects.filter(ballot=doc.idinternal.ballot, ad=login)
-    if discuss:
-        discuss = discuss[0]
-    comment = IESGComment.objects.filter(ballot=doc.idinternal.ballot, ad=login)
-    if comment:
-        comment = comment[0]
+    pos, discuss, comment = get_ballot_info(doc.idinternal.ballot, login)
 
     if request.method == 'POST':
         form = EditPositionForm(request.POST)
@@ -440,11 +442,12 @@ def edit_position(request, name):
                 if comment.text:
                     add_document_comment(request, doc, comment.text, ballot=DocumentComment.BALLOT_COMMENT)
 
-                
-            #email_owner(request, doc, doc.idinternal.job_owner, login, "A new comment added by %s" % login)
             doc.idinternal.event_date = date.today()
             doc.idinternal.save()
-            return HttpResponseRedirect(doc.idinternal.get_absolute_url())
+            if request.POST.get("send_mail"):
+                return HttpResponseRedirect(urlreverse("doc_send_ballot_comment", kwargs=dict(name=doc.filename)))
+            else:
+                return HttpResponseRedirect(doc.idinternal.get_absolute_url())
     else:
         initial = {}
         if pos:
@@ -464,3 +467,48 @@ def edit_position(request, name):
                                    discuss=discuss,
                                    comment=comment),
                               context_instance=RequestContext(request))
+
+@group_required('Area_Director','Secretariat')
+def send_ballot_comment(request, name):
+    doc = get_object_or_404(InternetDraft, filename=name)
+    if not doc.idinternal:
+        raise Http404()
+
+    login = IESGLogin.objects.get(login_name=request.user.username)
+    pos, discuss, comment = get_ballot_info(doc.idinternal.ballot, login)
+    
+    subj = []
+    d = ""
+    if pos and pos.discuss == 1 and discuss and discuss.text:
+        d = discuss.text
+        subj.append("DISCUSS")
+    c = ""
+    if comment and comment.text:
+        c = comment.text
+        subj.append("COMMENT")
+
+    subject = "%s: %s" % (" and ".join(subj), doc.file_tag())
+    body = render_to_string("idrfc/ballot_comment_mail.txt",
+                            dict(discuss=d, comment=c))
+    frm = u"%s <%s>" % login.person.email()
+    to = "iesg@iesg.org"
+        
+    if request.method == 'POST':
+        cc = [x.strip() for x in request.POST.get("cc", "").split(',') if x.strip()]
+        if request.POST.get("cc_state_change") and doc.idinternal.state_change_notice_to:
+            cc.extend(doc.idinternal.state_change_notice_to.split(','))
+
+        send_mail_text(request, to, frm, subject, body, cc=", ".join(cc))
+            
+        return HttpResponseRedirect(doc.idinternal.get_absolute_url())
+  
+    return render_to_response('idrfc/send_ballot_comment.html',
+                              dict(doc=doc,
+                                   subject=subject,
+                                   body=body,
+                                   frm=frm,
+                                   to=to,
+                                   can_send=d or c),
+                              context_instance=RequestContext(request))
+
+

branch/iesg-tracker/ietf/templates/idrfc/ballot_comment_mail.txt

@@ -0,0 +1,6 @@
+{% if discuss %}Discuss:
+{{ discuss|safe }}
+
+{% endif %}{% if comment %}Comment:
+{{ comment|safe }}
+{% endif %}

branch/iesg-tracker/ietf/templates/idrfc/edit_position.html

@@ -24,6 +24,7 @@
 
   <div class="actions">
     <a href="{{ doc.idinternal.get_absolute_url }}">Back</a>
+    <input type="submit" name="send_mail" value="Save and send email"/>
     <input type="submit" value="Save"/>
   </div>
 </form>

branch/iesg-tracker/ietf/templates/idrfc/send_ballot_comment.html

@@ -0,0 +1,31 @@
+<h3>Email DISCUSS and COMMENT text to IESG list</h3>
+
+<form action="" method="POST">
+  <table>
+    <tr><td>From:</td> <td>{{ frm }}</td></tr>
+    <tr><td>To:</td> <td>{{ to }}</td></tr>
+    <tr>
+      <td>Cc:<br/>
+      <span class="help">separated by comma</span></td>
+      <td><input type="text" name="cc" value="" size="75" /><br/>
+      {% if doc.idinternal.state_change_notice_to %}
+      <label>
+        <input type="checkbox" name="cc_state_change" value="1" />
+        {{ doc.idinternal.state_change_notice_to }}
+      </label>
+      {% endif %}
+      </td>
+    </tr>
+    <tr><td>Subject:</td> <td>{{ subject }}</td></tr>
+    <tr>
+      <td>Body:</td>
+      <td><pre>{{ body }}</pre></td>
+    </tr>
+  </table>
+
+  <div class="actions">
+    <a href="{{ doc.idinternal.get_absolute_url }}">Back</a>
+    <input type="submit" value="Send"/>
+  </div>
+</form>
+