Finish ballot support for charters (apart from non-generic ballot

deferral), remove a bunch of now obsolete charter code.
 - Legacy-Id: 4255

Author: OleLaursen

ietf/doc/admin.py

@@ -104,14 +104,15 @@ def state(self, instance):
 admin.site.register(DocHistory, DocHistoryAdmin)
 
 class DocAliasAdmin(admin.ModelAdmin):
-    list_display = [ 'name', 'document_link', ]
-    search_fields = [ 'name', 'document__name', ]
+    list_display = ['name', 'document_link']
+    search_fields = ['name', 'document__name']
     raw_id_fields = ['document']
     document_link = admin_link("document")
 admin.site.register(DocAlias, DocAliasAdmin)
 
-
-admin.site.register(BallotType)
+class BallotTypeAdmin(admin.ModelAdmin):
+    list_display = ["slug", "doc_type", "name", "question"]
+admin.site.register(BallotType, BallotTypeAdmin)
 
 # events
 

ietf/doc/migrations/0001_initial.py

@@ -15,7 +15,7 @@ class StateType(models.Model):
     label = models.CharField(max_length=255, help_text="Label that should be used (e.g. in admin) for state drop-down for this type of state") # State, IESG state, WG state, ...
 
     def __unicode__(self):
-        return self.label
+        return self.slug
 
 class State(models.Model):
     type = models.ForeignKey(StateType)
@@ -374,14 +374,6 @@ class TelechatDocEvent(DocEvent):
     telechat_date = models.DateField(blank=True, null=True)
     returning_item = models.BooleanField(default=False)
 
-# Charter ballot events
-class GroupBallotPositionDocEvent(DocEvent):
-    ad = models.ForeignKey(Person)
-    pos = models.ForeignKey(GroupBallotPositionName, verbose_name="position", default="norecord")
-    block_comment = models.TextField(help_text="Blocking comment if position is comment", blank=True)
-    block_comment_time = models.DateTimeField(help_text="Blocking comment was written", blank=True, null=True)
-    comment = models.TextField(help_text="Non-blocking comment", blank=True)
-    comment_time = models.DateTimeField(help_text="Time non-blocking comment was written", blank=True, null=True)
-
+# charter events
 class InitialReviewDocEvent(DocEvent):
     expires = models.DateTimeField(blank=True, null=True)

ietf/doc/migrations/0002_auto__add_field_ballotpositiondocevent_ballot.py

@@ -817,7 +817,7 @@ class Meta:
 class Position(BallotPositionDocEvent):
     def from_object(self, base):
         for f in base._meta.fields:
-            if not f.name in ('discuss',): # don't overwrite properties
+            if not f.name in ('discuss', 'ballot'): # don't overwrite properties
                 setattr(self, f.name, getattr(base, f.name))
         return self
 

ietf/doc/migrations/__init__.py

@@ -86,9 +86,9 @@ def needed_ballot_positions(doc, active_positions):
             answer.append("Needs %d more positions." % more)
     else:
         if blocking:
-            answer.append("Has enough positions to pass.")
+            answer.append("Has enough positions to pass once %s positions are resolved." % blocking[0].pos.name.upper())
         else:
-            answer.append("Has enough positions to pass once %s positions are resolved." % blocking[0].name.upper())
+            answer.append("Has enough positions to pass.")
 
     return " ".join(answer)
 

ietf/doc/models.py

@@ -75,18 +75,15 @@ def render_ballot_icon(context, doc):
             name = doc.document().filename()
         else:
             name = doc.document().filename
-        tracker_id = doc.draft_id
     else:
         if doc.in_ietf_process() and doc.ietf_process.has_active_iesg_ballot():
             ballot = doc._idinternal.ballot
         else:
             return ""
         if doc.is_rfc_wrapper:
             name = "rfc"+str(doc.rfc_number)
-            tracker_id = doc.rfc_number
         else:
             name = doc.draft_name
-            tracker_id = doc.tracker_id
     adId = get_user_adid(context)
     red = 0
     green = 0
@@ -109,10 +106,15 @@ def render_ballot_icon(context, doc):
             blank = blank + 1
         if adId and (p['ad'].id == adId):
             my = position_to_string(p['pos'])
-    return render_ballot_icon2(name, tracker_id, red,yellow,green,gray,blank, my, adId)+"<!-- adId="+str(adId)+" my="+str(my)+"-->"
+    return render_ballot_icon2(name, red,yellow,green,gray,blank, my, adId)+"<!-- adId="+str(adId)+" my="+str(my)+"-->"
 
-def render_ballot_icon2(draft_name, tracker_id, red,yellow,green,gray,blank, my,adId):
-    edit_position_url = urlreverse('doc_edit_position', kwargs=dict(name=draft_name))
+def render_ballot_icon2(draft_name, red,yellow,green,gray,blank, my,adId):
+    from ietf.doc.models import BallotDocEvent
+    ballots = BallotDocEvent.objects.filter(doc__docalias__name=draft_name).order_by("-time", "-id")
+    if ballots:
+        edit_position_url = urlreverse('doc_edit_position', kwargs=dict(name=draft_name, ballot_id=ballots[0].pk))
+    else:
+        edit_position_url = ""
     if adId:
         res_cm = ' oncontextmenu="editBallot(\''+str(edit_position_url)+'\');return false;"'
     else:

ietf/doc/proxy.py

@@ -418,7 +418,8 @@ class EditPositionTestCase(django.test.TestCase):
 
     def test_edit_position(self):
         draft = make_test_data()
-        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.name))
+        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.name,
+                                                          ballot_id=draft.latest_event(BallotDocEvent, type="created_ballot").pk))
         login_testing_unauthorized(self, "ad", url)
 
         ad = Person.objects.get(name="Aread Irector")
@@ -479,7 +480,8 @@ def test_edit_position(self):
 
     def test_edit_position_as_secretary(self):
         draft = make_test_data()
-        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.name))
+        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.name,
+                                                          ballot_id=draft.latest_event(BallotDocEvent, type="created_ballot").pk))
         ad = Person.objects.get(name="Aread Irector")
         url += "?ad=%s" % ad.pk
         login_testing_unauthorized(self, "secretary", url)
@@ -507,13 +509,16 @@ def test_send_ballot_comment(self):
         draft.save()
 
         ad = Person.objects.get(name="Aread Irector")
-        
+
+        ballot = draft.latest_event(BallotDocEvent, type="created_ballot")
+
         BallotPositionDocEvent.objects.create(doc=draft, type="changed_ballot_position",
-                                      by=ad, ad=ad, pos=BallotPositionName.objects.get(slug="yes"),
-                                      comment="Test!",
-                                      comment_time=datetime.datetime.now())
+                                              by=ad, ballot=ballot, ad=ad, pos=BallotPositionName.objects.get(slug="yes"),
+                                              comment="Test!",
+                                              comment_time=datetime.datetime.now())
 
-        url = urlreverse('doc_send_ballot_comment', kwargs=dict(name=draft.name))
+        url = urlreverse('doc_send_ballot_comment', kwargs=dict(name=draft.name,
+                                                                ballot_id=ballot.pk))
         login_testing_unauthorized(self, "ad", url)
 
         # normal get
@@ -670,10 +675,13 @@ def test_issue_ballot(self):
         url = urlreverse('doc_ballot_writeupnotes', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "ad", url)
 
+        ballot = draft.latest_event(BallotDocEvent, type="created_ballot")
+
         def create_pos(num, vote, comment="", discuss=""):
             ad = Person.objects.get(name="Ad No%s" % num)
             e = BallotPositionDocEvent()
             e.doc = draft
+            e.ballot = ballot
             e.by = ad
             e.ad = ad
             e.pos = BallotPositionName.objects.get(slug=vote)

ietf/doc/utils.py

@@ -240,7 +240,7 @@ def edit_positionREDESIGN(request, name, ballot_id):
     if 'HTTP_REFERER' in request.META:
         return_to_url = request.META['HTTP_REFERER']
     else:
-        return_to_url = urlreverse("doc_ballot", kwargs=dict(name=doc.name, ballot=ballot_id))
+        return_to_url = urlreverse("doc_ballot", kwargs=dict(name=doc.name, ballot_id=ballot_id))
 
     # if we're in the Secretariat, we can select an AD to act as stand-in for
     if not has_role(request.user, "Area Director"):
@@ -447,12 +447,12 @@ def send_ballot_commentREDESIGN(request, name, ballot_id):
 
     return_to_url = request.GET.get('return_to_url')
     if not return_to_url:
-        return_to_url = urlreverse("doc_ballot", kwargs=dict(name=doc.name, ballot=ballot_id))
+        return_to_url = urlreverse("doc_ballot", kwargs=dict(name=doc.name, ballot_id=ballot_id))
 
     if 'HTTP_REFERER' in request.META:
         back_url = request.META['HTTP_REFERER']
     else:
-        back_url = urlreverse("doc_ballot", kwargs=dict(name=doc.name, ballot=ballot_id))
+        back_url = urlreverse("doc_ballot", kwargs=dict(name=doc.name, ballot_id=ballot_id))
 
     # if we're in the Secretariat, we can select an AD to act as stand-in for
     if not has_role(request.user, "Area Director"):