/doc/*: Show information about ballot sets

 - Legacy-Id: 2166

Author: pasieronen

ietf/idrfc/idrfc_wrapper.py

@@ -532,9 +532,7 @@ class BallotWrapper:
     _idinternal = None
     ballot = None
     ballot_active = False
-
     _positions = None
-
     position_values = ["Discuss", "Yes", "No Objection", "Abstain", "Recuse", "No Record"]
 
     def __init__(self, idinternal):
@@ -544,6 +542,7 @@ def __init__(self, idinternal):
             self.ballot_active = self.ballot.ballot_issued and (str(idinternal.cur_state) in BALLOT_ACTIVE_STATES) and str(idinternal.draft.status)=="Active";
         else:
             self.ballot_active = self.ballot.ballot_issued and (str(idinternal.cur_state) in BALLOT_ACTIVE_STATES)
+        self._ballot_set = None
 
     def approval_text(self):
         return self.ballot.approval_text
@@ -559,6 +558,15 @@ def deferred_by(self):
         return self.ballot.defer_by
     def deferred_date(self):
         return self.ballot.defer_date
+    def is_ballot_set(self):
+        if not self._ballot_set:
+            self._ballot_set = self._idinternal.ballot_set()
+        return len(list(self._ballot_set)) > 1
+    def ballot_set_other(self):
+        if not self.is_ballot_set():
+            return []
+        else:
+            return self._ballot_set.exclude(draft=self._idinternal)
 
     def _init(self):
         try:

ietf/idrfc/testurl.list

@@ -30,6 +30,11 @@
 200     /doc/rfc822/
 200     /doc/rfc822/_debug.data
 
+# ballot sets
+200	 /doc/rfc3550/_ballot.data
+200	 /doc/rfc3551/_ballot.data
+200	 /doc/draft-irtf-dtnrg-ltp/_ballot.data
+
 # file formats
 200     /doc/rfc9/ # PDF only
 200	/doc/rfc2490/ # TXT+PDF+PS

ietf/idrfc/views_doc.py

@@ -202,15 +202,19 @@ def document_ballot(request, name):
     r = re.compile("^rfc([1-9][0-9]*)$")
     m = r.match(name)
     if m:
-        id = get_object_or_404(IDInternal, rfc_flag=1, draft=int(m.group(1)))
+        rfc_number = int(m.group(1))
+        rfci = get_object_or_404(RfcIndex, rfc_number=rfc_number)
+        id = get_object_or_404(IDInternal, rfc_flag=1, draft=rfc_number)
+        doc = RfcWrapper(rfci, idinternal=id)
     else:
         id = get_object_or_404(IDInternal, rfc_flag=0, draft__filename=name)
+        doc = IdWrapper(id) 
     try:
         if not id.ballot.ballot_issued:
             raise Http404
     except BallotInfo.DoesNotExist:
         raise Http404
 
     ballot = BallotWrapper(id)
-    return render_to_response('idrfc/doc_ballot.html', {'ballot':ballot}, context_instance=RequestContext(request))
+    return render_to_response('idrfc/doc_ballot.html', {'ballot':ballot, 'doc':doc}, context_instance=RequestContext(request))
 

ietf/templates/idrfc/doc_ballot.html

@@ -1,5 +1,5 @@
 {% comment %}
-Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com> 
 
 Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,9 @@
 <td class="right">
 
 <h2 style="margin-top:12px;">Discusses and other comments</h2>
+
+{% if ballot.is_ballot_set %}<p>Other documents in this ballot set: {% for x in ballot.ballot_set_other%}{{x|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %}</p>{% endif %}
+
 {% if doc.in_ietf_process and doc.ietf_process.has_active_iesg_ballot %}
 <p>Summary: <i>{{ doc.ietf_process.iesg_ballot_needed }}</i></p>
 {% endif %}