Updated test cases to reflect the split of the ballot writeups page

Cleaned out old ballot writups view and url 
Modified layout of the writups tab for IESG and Secretariat
 - Legacy-Id: 2480

Author: rjsparks

rjs/ietf/idrfc/tests.py

@@ -470,7 +470,7 @@ class BallotWriteupsTestCase(django.test.TestCase):
 
     def test_edit_last_call_text(self):
         draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
-        url = urlreverse('doc_ballot_writeups', kwargs=dict(name=draft.filename))
+        url = urlreverse('doc_ballot_lastcall', kwargs=dict(name=draft.filename))
         login_testing_unauthorized(self, "klm", url)
 
         # normal get
@@ -507,7 +507,7 @@ def test_edit_last_call_text(self):
 
     def test_request_last_call(self):
         draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
-        url = urlreverse('doc_ballot_writeups', kwargs=dict(name=draft.filename))
+        url = urlreverse('doc_ballot_lastcall', kwargs=dict(name=draft.filename))
         login_testing_unauthorized(self, "klm", url)
 
         mailbox_before = len(mail_outbox)
@@ -524,7 +524,7 @@ def test_request_last_call(self):
 
     def test_edit_ballot_writeup(self):
         draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
-        url = urlreverse('doc_ballot_writeups', kwargs=dict(name=draft.filename))
+        url = urlreverse('doc_ballot_writeupnotes', kwargs=dict(name=draft.filename))
         login_testing_unauthorized(self, "klm", url)
 
         # normal get
@@ -544,7 +544,7 @@ def test_edit_ballot_writeup(self):
 
     def test_issue_ballot(self):
         draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
-        url = urlreverse('doc_ballot_writeups', kwargs=dict(name=draft.filename))
+        url = urlreverse('doc_ballot_writeupnotes', kwargs=dict(name=draft.filename))
         login_testing_unauthorized(self, "rhousley", url)
 
         draft.idinternal.ballot.ballot_issued = False
@@ -579,7 +579,7 @@ def test_issue_ballot(self):
 
     def test_edit_approval_text(self):
         draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
-        url = urlreverse('doc_ballot_writeups', kwargs=dict(name=draft.filename))
+        url = urlreverse('doc_ballot_approvaltext', kwargs=dict(name=draft.filename))
         login_testing_unauthorized(self, "klm", url)
 
         # normal get

rjs/ietf/idrfc/urls.py

@@ -55,7 +55,6 @@
     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/ballotwriteups/$', views_ballot.ballot_writeups, name='doc_ballot_writeups'),
     url(r'^(?P<name>[^/]+)/edit/lastcalltext/$', views_ballot.lastcalltext, name='doc_ballot_lastcall'),
     url(r'^(?P<name>[^/]+)/edit/ballotwriteupnotes/$', views_ballot.ballot_writeupnotes, name='doc_ballot_writeupnotes'),
     url(r'^(?P<name>[^/]+)/edit/approvaltext/$', views_ballot.ballot_approvaltext, name='doc_ballot_approvaltext'),

rjs/ietf/idrfc/views_ballot.py

@@ -307,130 +307,6 @@ class Meta:
     def clean_approval_text(self):
         return self.cleaned_data["approval_text"].replace("\r", "")
 
-@group_required('Area_Director','Secretariat')
-def ballot_writeups(request, name):
-    """Editing of ballot write-ups, sending last calls, ..."""
-    doc = get_object_or_404(InternetDraft, filename=name)
-    if not doc.idinternal:
-        raise Http404()
-
-    login = IESGLogin.objects.get(login_name=request.user.username)
-
-    try:
-        ballot = doc.idinternal.ballot
-    except BallotInfo.DoesNotExist:
-        ballot = generate_ballot(request, doc)
-
-    last_call_form = LastCallTextForm(instance=ballot)
-    ballot_writeup_form = BallotWriteupForm(instance=ballot)
-    approval_text_form = ApprovalTextForm(instance=ballot)
-
-    if request.method == 'POST':
-        if "save_last_call_text" in request.POST or "send_last_call_request" in request.POST:
-            last_call_form = LastCallTextForm(request.POST, instance=ballot)
-            if last_call_form.is_valid():
-                ballot.last_call_text = last_call_form.cleaned_data["last_call_text"]
-                ballot.save()
-
-                if "send_last_call_request" in request.POST:
-                    doc.idinternal.change_state(IDState.objects.get(document_state_id=IDState.LAST_CALL_REQUESTED), None)
-                    
-                    change = log_state_changed(request, doc, login)
-                    email_owner(request, doc, doc.idinternal.job_owner, login, change)
-                    request_last_call(request, doc)
-
-                    doc.idinternal.event_date = date.today()
-                    doc.idinternal.save()
-                    
-                    return render_to_response('idrfc/last_call_requested.html',
-                                              dict(doc=doc),
-                                              context_instance=RequestContext(request))
-        
-        if "regenerate_last_call_text" in request.POST:
-            ballot.last_call_text = generate_last_call_announcement(request, doc)
-            ballot.save()
-
-            # make sure form has the updated text
-            last_call_form = LastCallTextForm(instance=ballot)
-
-        if "save_ballot_writeup" in request.POST:
-            ballot_writeup_form = BallotWriteupForm(request.POST, instance=ballot)
-            if ballot_writeup_form.is_valid():
-                ballot.ballot_writeup = ballot_writeup_form.cleaned_data["ballot_writeup"]
-                ballot.save()
-
-        if "issue_ballot" in request.POST:
-            ballot_writeup_form = BallotWriteupForm(request.POST, instance=ballot)
-            approval_text_form = ApprovalTextForm(request.POST, instance=ballot)            
-            if ballot_writeup_form.is_valid() and approval_text_form.is_valid():
-                ballot.ballot_writeup = ballot_writeup_form.cleaned_data["ballot_writeup"]
-                ballot.approval_text = approval_text_form.cleaned_data["approval_text"]
-                ballot.active = True
-                ballot.ballot_issued = True
-                ballot.save()
-
-                if not Position.objects.filter(ballot=ballot, ad=login):
-                    pos = Position()
-                    pos.ballot = ballot
-                    pos.ad = login
-                    pos.yes = 1
-                    pos.noobj = pos.abstain = pos.approve = pos.discuss = pos.recuse = 0
-                    pos.save()
-
-                msg = generate_issue_ballot_mail(request, doc)
-                send_mail_preformatted(request, msg)
-
-                email_iana(request, doc, 'drafts-eval@icann.org', msg)
-                
-                doc.b_sent_date = date.today()
-                doc.save()
-
-                add_document_comment(request, doc, "Ballot has been issued")
-                    
-                doc.idinternal.event_date = date.today()
-                doc.idinternal.save()
-                    
-                return render_to_response('idrfc/ballot_issued.html',
-                                          dict(doc=doc),
-                                          context_instance=RequestContext(request))
-                
-
-        if "save_approval_text" in request.POST:
-            approval_text_form = ApprovalTextForm(request.POST, instance=ballot)            
-            if approval_text_form.is_valid():
-                ballot.approval_text = approval_text_form.cleaned_data["approval_text"]
-                ballot.save()
-                
-        if "regenerate_approval_text" in request.POST:
-            ballot.approval_text = generate_approval_mail(request, doc)
-            ballot.save()
-
-            # make sure form has the updated text
-            approval_text_form = ApprovalTextForm(instance=ballot)
-            
-        doc.idinternal.event_date = date.today()
-        doc.idinternal.save()
-
-    can_request_last_call = doc.idinternal.cur_state_id < 27
-    can_make_last_call = doc.idinternal.cur_state_id < 20
-    can_announce = doc.idinternal.cur_state_id > 19
-    docs_with_invalid_status = [d.document().file_tag() for d in doc.idinternal.ballot_set() if "None" in d.document().intended_status.intended_status or "Request" in d.document().intended_status.intended_status]
-    need_intended_status = ", ".join(docs_with_invalid_status)
-
-    return render_to_response('idrfc/ballot_writeups.html',
-                              dict(doc=doc,
-                                   ballot=ballot,
-                                   last_call_form=last_call_form,
-                                   ballot_writeup_form=ballot_writeup_form,
-                                   approval_text_form=approval_text_form,
-                                   can_request_last_call=can_request_last_call,
-                                   can_make_last_call=can_make_last_call,
-                                   can_announce=can_announce,
-                                   need_intended_status=need_intended_status,
-                                   ),
-                              context_instance=RequestContext(request))
-
-
 @group_required('Area_Director','Secretariat')
 def lastcalltext(request, name):
     """Editing of the last call text"""

rjs/ietf/templates/idrfc/doc_main.html

@@ -130,20 +130,39 @@ <h1>{% block doc_h1 %}{% endblock %}</h1>
 
 <div id="writeup">
 <div id="writeup_content">
+---- following is a DRAFT of message to be sent AFTER approval ---
 {% if doc.in_ietf_process and doc.ietf_process.has_iesg_ballot %}
 {% if user|in_group:"Area_Director,Secretariat" %}
-<div style="margin-bottom:8px;">
-<span id="doc_writeup_edit_button" class="yui-button yui-link-button"><span class="first-child">
-<a href="{% url doc_ballot_writeups name=doc.draft_name %}">Ballot write-ups</a>
-</span></span></div>
-{% endif %}{# user in_group #}
----- following is a DRAFT of message to be sent AFTER approval ---
+<div style="background:#E0E0FF">
+<p align=right>
+<span id="doc_edit_announce_button" class="yui-button yui-link-button"><span class="first-child">
+<a href="{% url doc_ballot_approvaltext name=doc.draft_name %}">Edit Announcement Text</a>
+</span></span>
+</p>
+{% endif %}
+{% endif %}
 <pre>
 {{ doc.ietf_process.iesg_ballot.approval_text|escape|urlize }}
 </pre>
+{% if doc.in_ietf_process and doc.ietf_process.has_iesg_ballot %}
+{% if user|in_group:"Area_Director,Secretariat" %}
+</div>
+
+<div style="background:#E0E0FF">
+<p align=right>
+<span id="doc_ballot_edit_button" class="yui-button yui-link-button"><span class="first-child">
+<a href="{% url doc_ballot_writeupnotes name=doc.draft_name %}">Edit Ballot Text</a>
+</span></span>
+</p>
+{% endif %}
+{% endif %}
 <pre>
 {{ doc.ietf_process.iesg_ballot.ballot_writeup|escape|urlize }}
 </pre>
+{% if doc.in_ietf_process and doc.ietf_process.has_iesg_ballot %}
+{% if user|in_group:"Area_Director,Secretariat" %}
+</div>
+{% endif %}
 {% endif %}
 </div>
 </div>