View for editing ballot position, so far only with voting support

 - Legacy-Id: 2275

Author: OleLaursen

branch/iesg-tracker/ietf/idrfc/fixtures/ballot.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<django-objects version="1.0">
+    <object pk="3175" model="idtracker.ballotinfo">
+        <field type="BooleanField" name="active">1</field>
+        <field type="BooleanField" name="an_sent">0</field>
+        <field type="DateField" name="an_sent_date"><None></None></field>
+        <field to="idtracker.iesglogin" name="an_sent_by" rel="ManyToOneRel"><None></None></field>
+        <field type="BooleanField" name="defer">0</field>
+        <field to="idtracker.iesglogin" name="defer_by" rel="ManyToOneRel">111</field>
+        <field type="DateField" name="defer_date">2009-10-06</field>
+        <field type="TextField" name="approval_text">From: The IESG &lt;iesg-secretary@ietf.org&gt;
+To: IETF-Announce &lt;ietf-announce@ietf.org&gt;
+Cc: Internet Architecture Board &lt;iab@iab.org&gt;,
+    RFC Editor &lt;rfc-editor@rfc-editor.org&gt;, 
+    mipshop mailing list &lt;mipshop@ietf.org&gt;, 
+    mipshop chair &lt;mipshop-chairs@tools.ietf.org&gt;
+Subject: Protocol Action: 'Fast Handovers for Proxy Mobile IPv6' to
+Proposed Standard
+
+The IESG has approved the following document:
+
+- 'Fast Handovers for Proxy Mobile IPv6 '
+   &lt;draft-ietf-mipshop-pfmipv6-09.txt&gt; as a Proposed Standard
+
+
+This document is the product of the Mobility for IP: Performance,
+Signaling and Handoff Optimization Working Group. 
+
+The IESG contact persons are Jari Arkko and Ralph Droms.
+
+A URL of this Internet-Draft is:
+http://www.ietf.org/internet-drafts/draft-ietf-mipshop-pfmipv6-09.txt</field>
+        <field type="TextField" name="last_call_text">To: IETF-Announce &lt;ietf-announce@ietf.org&gt; 
+From: The IESG &lt;iesg-secretary@ietf.org&gt;
+Reply-to: ietf@ietf.org
+CC: &lt;mipshop@ietf.org&gt;
+Subject: Last Call: draft-ietf-mipshop-pfmipv6 (Fast Handovers for Proxy Mobile IPv6) to Proposed Standard
+
+The IESG has received a request from the Mobility for IP: Performance, 
+Signaling and Handoff Optimization WG (mipshop) to consider the following document:
+
+- 'Fast Handovers for Proxy Mobile IPv6 '
+   &lt;draft-ietf-mipshop-pfmipv6-09.txt&gt; as a Proposed Standard
+
+The IESG plans to make a decision in the next few weeks, and solicits
+final comments on this action.  Please send substantive comments to the
+ietf@ietf.org mailing lists by 2009-09-22. Exceptionally, 
+comments may be sent to iesg@ietf.org instead. In either case, please 
+retain the beginning of the Subject line to allow automated sorting.
+
+The file can be obtained via
+http://www.ietf.org/internet-drafts/draft-ietf-mipshop-pfmipv6-09.txt
+
+
+IESG discussion can be tracked via
+https://datatracker.ietf.org/public/pidtracker.cgi?command=view_id&amp;dTag=17914&amp;rfc_flag=0</field>
+        <field type="TextField" name="ballot_writeup">Technical Summary
+
+   The document describes a mechanism to provide fast handovers when
+   Proxy Mobile IPv6 is used as the mobility management protocol. It
+   also describes a mechanism to transfer context between two MAGs
+   to assist in the handover. The mobile node is not involved in any
+   Signaling for the fast handovers to work.
+
+Working Group Summary
+
+   This is a product of the MIPSHOP WG.
+
+Document Quality
+
+   There are no known implementations of the specification. It is likely
+   to be implemented by some vendors, since this document is required 
+   for fast handovers in 3GPP2 eHPRD network.
+
+Personnel
+
+   Document shepherd: Vijay Devarapalli
+   Responsible AD: Jari Arkko
+
+RFC Editor Note
+
+  (Insert RFC Editor Note here or remove section)
+
+IRTF Note
+
+  (Insert IRTF Note here or remove section)
+
+IESG Note
+
+  (Insert IESG Note here or remove section)
+
+IANA Note
+
+  (Insert IANA Note here or remove section)</field>
+        <field type="IntegerField" name="ballot_issued">1</field>
+    </object>
+</django-objects>

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

@@ -49,7 +49,7 @@ def output(name, qs):
 output("base", base)
 
 
-# specific draft
+# specific drafts
 draftdata = []
 d = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
 draftdata.extend([d, d.idinternal, d.group, d.group.ietfwg])
@@ -60,3 +60,7 @@ def output(name, qs):
 d = InternetDraft.objects.get(filename="draft-ietf-mip6-cn-ipsec")
 draftdata.extend([d, d.idinternal])
 output("draft", draftdata)
+
+# specific ballot info
+d = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+output("ballot", [d.idinternal.ballot]) 

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

@@ -223,7 +223,7 @@ class AddCommentTestCase(django.test.TestCase):
     fixtures = ['base', 'draft']
 
     def test_add_comment(self):
-        draft = InternetDraft.objects.get(filename="draft-ietf-mip6-cn-ipsec")
+        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
         url = urlreverse('doc_add_comment', kwargs=dict(name=draft.filename))
         login_testing_unauthorized(self, "klm", url)
 
@@ -244,6 +244,55 @@ def test_add_comment(self):
         self.assertTrue(len(mail_outbox) == 1)
         self.assertTrue("updated" in mail_outbox[0]['Subject'])
         self.assertTrue(draft.filename in mail_outbox[0]['Subject'])
+
+class EditPositionTestCase(django.test.TestCase):
+    fixtures = ['base', 'draft', 'ballot']
+
+    def test_edit_position(self):
+        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.filename))
+        login_testing_unauthorized(self, "rhousley", 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=position]')) > 0)
+        self.assertEquals(len(q('form textarea[name=comment_text]')), 1)
+
+        # vote
+        comments_before = draft.idinternal.comments().count()
+        self.assertTrue(not Position.objects.filter(ballot=draft.idinternal.ballot, ad__login_name="rhousley"))
+        
+        r = self.client.post(url, dict(position="discuss",
+                                       discuss="This is a discussion test.",
+                                       comment="This is a test."))
+        self.assertEquals(r.status_code, 302)
+
+        pos = Position.objects.filter(ballot=draft.idinternal.ballot, ad__login_name="rhousley")[0]
+        #self.assertTrue("This is a discussion test." in pos.discuss) FIXME
+        #self.assertTrue("This is a test." in pos.comment)
+        self.assertTrue(pos.discuss)
+        self.assertTrue(not (pos.yes or pos.noobj or pos.abstain or pos.recuse))
+        
+        self.assertEquals(draft.idinternal.comments().count(), comments_before + 1)
+        self.assertTrue("New position" in draft.idinternal.comments()[0].comment_text)
+
+        # recast vote
+        comments_before = draft.idinternal.comments().count()
+        r = self.client.post(url, dict(position="noobj"))
+        self.assertEquals(r.status_code, 302)
+
+        pos = Position.objects.filter(ballot=draft.idinternal.ballot, ad__login_name="rhousley")[0]
+        self.assertTrue(pos.noobj)
+        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(len(mail_outbox) == 1)
+        #self.assertTrue("updated" in mail_outbox[0]['Subject'])
+        #self.assertTrue(draft.filename in mail_outbox[0]['Subject'])
 
 
 TEST_RFC_INDEX = '''<?xml version="1.0" encoding="UTF-8"?>

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

@@ -42,8 +42,10 @@
     (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/addcomment/$', views_edit.add_comment, {}, name='doc_add_comment'),
+    url(r'^(?P<name>[^/]+)/edit/position/$', views_edit.edit_position, {}, name='doc_edit_position'),
 )

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

@@ -337,3 +337,80 @@ def add_comment(request, name):
                               dict(doc=doc,
                                    form=form),
                               context_instance=RequestContext(request))
+
+BALLOT_CHOICES = (("yes", "Yes"),
+                  ("noobj", "No Objection"),
+                  ("discuss", "Discuss"),
+                  ("abstain", "Abstain"),
+                  ("recuse", "Recuse"),
+                  ("", "No Record"),
+                  )
+
+def position_to_ballot_choice(position):
+    for v, label in BALLOT_CHOICES:
+        if v and getattr(position, v):
+            return v
+    return ""
+
+def position_label(position_value):
+    return dict(BALLOT_CHOICES).get(position_value, "")
+    
+class EditPositionForm(forms.Form):
+    position = forms.ChoiceField(choices=BALLOT_CHOICES, widget=forms.RadioSelect)
+    discuss_text = forms.CharField(required=False, widget=forms.Textarea)
+    comment_text = forms.CharField(required=False, widget=forms.Textarea)
+
+@group_required('Area_Director','Secretariat')
+def edit_position(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)
+
+    if request.method == 'POST':
+        form = EditPositionForm(request.POST)
+        if form.is_valid():
+            vote = form.cleaned_data['position']
+            try:
+                pos = Position.objects.get(ballot=doc.idinternal.ballot, ad=login)
+                # mark discuss as cleared (quirk from old system)
+                if pos.discuss:
+                    pos.discuss = -1
+            except Position.DoesNotExist:
+                pos = Position(ballot=doc.idinternal.ballot, ad=login)
+                pos.discuss = 0
+                
+            old_vote = position_to_ballot_choice(pos)
+            
+            pos.yes = pos.noobj = pos.abstain = pos.recuse = 0
+            if vote:
+                setattr(pos, vote, 1)
+
+            if pos.id:
+                pos.save()
+                add_document_comment(request, doc, "[Ballot Position Update] Position for %s has been changed to %s from %s" % (pos.ad, position_label(vote), position_label(old_vote)))
+            elif vote:
+                pos.save()
+                add_document_comment(request, doc, "[Ballot Position Update] New position, %s, has been recorded" % position_label(vote))
+
+            IESGDiscuss.objects.filter(ballot=doc.idinternal.ballot, ad=pos.ad).update(active=False)
+
+            # FIXME: discuss and comments
+                
+            #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())
+    else:
+        initial = {}
+        pos = Position.objects.filter(ballot=doc.idinternal.ballot, ad=login)
+        if pos:
+            initial['position'] = position_to_ballot_choice(pos[0])
+            
+        form = EditPositionForm(initial=initial)
+  
+    return render_to_response('idrfc/edit_position.html',
+                              dict(doc=doc,
+                                   form=form),
+                              context_instance=RequestContext(request))

branch/iesg-tracker/ietf/idtracker/models.py

@@ -679,7 +679,7 @@ class Position(models.Model):
     yes = models.IntegerField(db_column='yes_col')
     noobj = models.IntegerField(db_column='no_col')
     abstain = models.IntegerField()
-    approve = models.IntegerField()
+    approve = models.IntegerField(default=0) # doesn't appear to be used anymore?
     discuss = models.IntegerField()
     recuse = models.IntegerField()
     def __str__(self):

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

@@ -1,7 +1,5 @@
 <form action="" method="POST">
-  <table>
-    {{ form.as_table }}
-  </table>
+  {{ form.comment }}
 
   <div class="actions">
     <a href="{{ doc.idinternal.get_absolute_url }}">Back</a>

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

@@ -34,13 +34,8 @@
 {% load ietf_filters %}
 <table class="ietf-ballot"><tr valign="top"><td class="left">
 
-{% if doc_ballot_edit_button %}
-{% if user|in_group:"Area_Director,Secretariat" %}
-<div style="margin-top:8px; margin-bottom:8px;">
-<span id="doc_ballot_button" class="yui-button yui-link-button"><span class="first-child">
-<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=open_ballot&amp;id_document_tag={% if info.is_rfc %}{{doc.rfc_number}}{% else %}{{doc.tracker_id}}{% endif %}">Edit position</a>
-</span></span></div>
-{% endif %}{# user in_group #}
+{% if doc_ballot_edit_button and user|in_group:"Area_Director,Secretariat" %}
+<div style="margin-top:8px; margin-bottom:8px;"><span id="doc_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url doc_edit_position name=doc.draft_name %}">Edit position</a></span></span></div>
 {% endif %}
 
 <p style="margin-top:1em;"><span class="square" style="background:#c00000;"></span><b>Discuss</b><br/>

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

@@ -0,0 +1,30 @@
+<style>
+  form.position-form .position ul {
+    padding: 0;
+    margin: 0;
+  }  
+  form.position-form .position li {
+    list-style-type: none;
+    float: left;
+    padding-right: 10px;
+  }
+  form.position-form .discuss-text {
+    clear: left;
+  }
+</style>
+
+<form class="position-form" action="" method="POST">
+  <div class="position">{{ form.position }}</div>
+
+  <div class="discuss-text">{{ form.discuss_text.label_tag }}:</div>
+  {{ form.discuss_text }}
+  
+  <div class="comment-text">{{ form.comment_text.label_tag }}:</div>
+  <div>{{ form.comment_text }}</div>
+
+  <div class="actions">
+    <a href="{{ doc.idinternal.get_absolute_url }}">Back</a>
+    <input type="submit" value="Save"/>
+  </div>
+</form>
+