Ported defer/undefer ballot views and tests to new schema

 - Legacy-Id: 2854

Author: OleLaursen

ietf/idrfc/mails.py

@@ -22,6 +22,7 @@ def email_state_changed(request, doc, text):
 
 def email_state_changedREDESIGN(request, doc, text):
     to = [x.strip() for x in doc.notify.replace(';', ',').split(',')]
+    text = strip_tags(text)
     send_mail(request, to, None,
               "ID Tracker State Update Notice: %s" % doc.file_tag(),
               "idrfc/state_changed_email.txt",

ietf/idrfc/testsREDESIGN.py

@@ -655,53 +655,51 @@ def test_send_ballot_comment(self):
 
 
 class DeferBallotTestCase(django.test.TestCase):
-    fixtures = ['base', 'draft', 'ballot']
+    fixtures = ['names']
 
     def test_defer_ballot(self):
-        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+        draft = make_test_data()
+        draft.iesg_state_id = "iesg-eva"
+        draft.save()
+        
         url = urlreverse('doc_defer_ballot', kwargs=dict(name=draft.name))
-        login_testing_unauthorized(self, "rhousley", url)
+        login_testing_unauthorized(self, "ad", url)
 
         # normal get
         r = self.client.get(url)
         self.assertEquals(r.status_code, 200)
 
         # defer
-        self.assertTrue(not draft.idinternal.ballot.defer)
         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.assertTrue(draft.idinternal.ballot.defer)
-        self.assertTrue(draft.idinternal.cur_state_id == IDState.IESG_EVALUATION_DEFER)
+        draft = Document.objects.get(name=draft.name)
+        self.assertEquals(draft.iesg_state_id, "defer")
 
         self.assertEquals(len(mail_outbox), mailbox_before + 2)
         self.assertTrue("Deferred" in mail_outbox[-2]['Subject'])
         self.assertTrue(draft.file_tag() in mail_outbox[-2]['Subject'])
 
     def test_undefer_ballot(self):
-        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+        draft = make_test_data()
+        draft.iesg_state_id = "defer"
+        draft.save()
+        
         url = urlreverse('doc_undefer_ballot', kwargs=dict(name=draft.name))
-        login_testing_unauthorized(self, "rhousley", url)
+        login_testing_unauthorized(self, "ad", url)
 
-        draft.idinternal.ballot.defer = True
-        draft.idinternal.ballot.save()
-        
         # normal get
         r = self.client.get(url)
         self.assertEquals(r.status_code, 200)
 
         # undefer
-        self.assertTrue(draft.idinternal.ballot.defer)
-        
         r = self.client.post(url, dict())
         self.assertEquals(r.status_code, 302)
 
-        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
-        self.assertTrue(not draft.idinternal.ballot.defer)
-        self.assertEquals(draft.idinternal.cur_state_id, IDState.IESG_EVALUATION)
+        draft = Document.objects.get(name=draft.name)
+        self.assertEquals(draft.iesg_state_id, "iesg-eva")
 
 class BallotWriteupsTestCase(django.test.TestCase):
     fixtures = ['base', 'draft', 'ballot']
@@ -783,7 +781,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_writeupnotes', kwargs=dict(name=draft.name))
-        login_testing_unauthorized(self, "rhousley", url)
+        login_testing_unauthorized(self, "ad", url)
 
         draft.idinternal.ballot.ballot_issued = False
         draft.idinternal.ballot.save()

ietf/idrfc/utils.py

@@ -3,6 +3,8 @@
 from ietf.idtracker.models import InternetDraft, DocumentComment, BallotInfo, IESGLogin
 from ietf.idrfc.mails import *
 
+from doc.models import Telechat, Event
+
 def add_document_comment(request, doc, text, include_by=True, ballot=None):
     if request:
         login = IESGLogin.objects.get(login_name=request.user.username)
@@ -59,6 +61,20 @@ def log_state_changed(request, doc, by, email_watch_list=True):
 
     return change
 
+def log_state_changedREDESIGN(request, doc, by, prev_iesg_state):
+    e = Event(doc=doc, by=by)
+    e.type = "changed_document"
+    e.desc = u"State changed to <b>%s</b> from <b>%s</b> by %s" % (
+        doc.iesg_state.name,
+        prev_iesg_state.name if prev_iesg_state else "None",
+        by.get_name())
+    e.save()
+    return e
+
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    log_state_changed = log_state_changedREDESIGN
+
 
 def update_telechat(request, idinternal, new_telechat_date, new_returning_item=None):
     on_agenda = bool(new_telechat_date)
@@ -98,7 +114,6 @@ def update_telechat(request, idinternal, new_telechat_date, new_returning_item=N
 def update_telechatREDESIGN(request, doc, by, new_telechat_date, new_returning_item=None):
     on_agenda = bool(new_telechat_date)
 
-    from doc.models import Telechat
     prev = doc.latest_event(Telechat, type="scheduled_for_telechat")
     prev_returning = bool(prev and prev.returning_item)
     prev_telechat = prev.telechat_date if prev else None

ietf/idrfc/views_ballot.py

@@ -23,7 +23,7 @@
 from ietf.idrfc.lastcall import request_last_call
 
 from doc.models import Document, Event, BallotPosition, save_document_in_history
-from name.models import BallotPositionName
+from name.models import BallotPositionName, IesgDocStateName
 
 BALLOT_CHOICES = (("yes", "Yes"),
                   ("noobj", "No Objection"),
@@ -488,9 +488,46 @@ def defer_ballot(request, name):
 
     return render_to_response('idrfc/defer_ballot.html',
                               dict(doc=doc,
-                                   telechat_date=telechat_date),
+                                   telechat_date=telechat_date,
+                                   back_url=doc.idinternal.get_absolute_url()),
                               context_instance=RequestContext(request))
 
+@group_required('Area_Director','Secretariat')
+def defer_ballotREDESIGN(request, name):
+    """Signal post-pone of Internet Draft ballot, notifying relevant parties."""
+    doc = get_object_or_404(Document, docalias__name=name)
+    if not doc.iesg_state:
+        raise Http404()
+
+    login = request.user.get_profile().email()
+    telechat_date = TelechatDates.objects.all()[0].date2
+
+    if request.method == 'POST':
+        save_document_in_history(doc)
+
+        prev = doc.iesg_state
+        doc.iesg_state = IesgDocStateName.objects.get(slug='defer')
+        e = log_state_changed(request, doc, login, prev)
+        
+        doc.time = e.time
+        doc.save()
+
+        email_state_changed(request, doc, e.desc)
+
+        update_telechat(request, doc, login, telechat_date)
+        email_ballot_deferred(request, doc, login.get_name(), telechat_date)
+
+        return HttpResponseRedirect(doc.get_absolute_url())
+  
+    return render_to_response('idrfc/defer_ballot.html',
+                              dict(doc=doc,
+                                   telechat_date=telechat_date,
+                                   back_url=doc.get_absolute_url()),
+                              context_instance=RequestContext(request))
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    defer_ballot = defer_ballotREDESIGN
+
 @group_required('Area_Director','Secretariat')
 def undefer_ballot(request, name):
     """Delete deferral of Internet Draft ballot."""
@@ -513,9 +550,42 @@ def undefer_ballot(request, name):
         return HttpResponseRedirect(doc.idinternal.get_absolute_url())
 
     return render_to_response('idrfc/undefer_ballot.html',
-                              dict(doc=doc),
+                              dict(doc=doc,
+                                   back_url=doc.idinternal.get_absolute_url()),
                               context_instance=RequestContext(request))
 
+@group_required('Area_Director','Secretariat')
+def undefer_ballotREDESIGN(request, name):
+    """Delete deferral of Internet Draft ballot."""
+    doc = get_object_or_404(Document, docalias__name=name)
+    if not doc.iesg_state:
+        raise Http404()
+
+    login = request.user.get_profile().email()
+    
+    if request.method == 'POST':
+        save_document_in_history(doc)
+
+        prev = doc.iesg_state
+        doc.iesg_state = IesgDocStateName.objects.get(slug='iesg-eva')
+        e = log_state_changed(request, doc, login, prev)
+        
+        doc.time = e.time
+        doc.save()
+
+        email_state_changed(request, doc, e.desc)
+        
+        return HttpResponseRedirect(doc.get_absolute_url())
+  
+    return render_to_response('idrfc/undefer_ballot.html',
+                              dict(doc=doc,
+                                   back_url=doc.get_absolute_url()),
+                              context_instance=RequestContext(request))
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    undefer_ballot = undefer_ballotREDESIGN
+
+
 class LastCallTextForm(forms.ModelForm):
     def clean_last_call_text(self):
         lines = self.cleaned_data["last_call_text"].split("\r\n")

ietf/idrfc/views_edit.py

@@ -102,21 +102,15 @@ def change_stateREDESIGN(request, name):
             if state != doc.iesg_state:
                 save_document_in_history(doc)
 
-                prev_state = doc.iesg_state
+                prev = doc.iesg_state
                 doc.iesg_state = state
-                
-                e = Event(doc=doc, by=login)
-                e.type = "changed_document"
-                e.desc = u"State changed to <b>%s</b> from <b>%s</b> by %s" % (
-                    doc.iesg_state.name,
-                    prev_state.name if prev_state else "None",
-                    login.get_name())
-                e.save()
+
+                e = log_state_changed(request, doc, login, prev)
 
                 doc.time = e.time
                 doc.save()
 
-                email_state_changed(request, doc, strip_tags(e.desc))
+                email_state_changed(request, doc, e.desc)
                 email_owner(request, doc, doc.ad, login, e.desc)
 
                 if doc.iesg_state_id == "lc-req":

ietf/templates/idrfc/defer_ballot.html

@@ -11,7 +11,7 @@ <h1>Defer ballot for {{ doc }}</h1>
   <p>The ballot will then be on the IESG agenda of {{ telechat_date }}.</p>
 
   <div class="actions">
-    <a href="{{ doc.idinternal.get_absolute_url }}">Back</a>
+    <a href="{{ back_url }}">Back</a>
     <input type="submit" value="Defer ballot"/>
   </div>
 </form>

ietf/templates/idrfc/undefer_ballot.html

@@ -9,7 +9,7 @@ <h1>Undefer ballot for {{ doc }}</h1>
   <p>Undefer the ballot for {{ doc.file_tag }}?</p>
 
   <div class="actions">
-    <a href="{{ doc.idinternal.get_absolute_url }}">Back</a>
+    <a href="{{ back_url }}">Back</a>
     <input type="submit" value="Undefer ballot"/>
   </div>
 </form>