Remove ballot.tsv view and comment out the ballot.json view in urls.py

- Legacy-Id: 5299

ietf/doc/views_doc.py

@@ -638,47 +638,44 @@ def ballot_for_popup(request, name):
     doc = get_object_or_404(Document, docalias__name=name)
     return HttpResponse(document_ballot_content(request, doc, ballot_id=None, editable=False))
 
-def get_ballot(name):
-    from ietf.doc.models import DocAlias
-    alias = get_object_or_404(DocAlias, name=name)
-    d = alias.document
-    from ietf.idtracker.models import InternetDraft, BallotInfo
-    from ietf.idrfc.idrfc_wrapper import BallotWrapper, IdWrapper, RfcWrapper
-    id = None
-    bw = None
-    dw = None
-    if (d.type_id=='draft'):
-        id = get_object_or_404(InternetDraft, name=d.name)
-        try:
-            if not id.ballot.ballot_issued:
-                raise Http404
-        except BallotInfo.DoesNotExist:
-            raise Http404
-
-        bw = BallotWrapper(id)               # XXX Fixme: Eliminate this as we go forward
-        # Python caches ~100 regex'es -- explicitly compiling it inside a method
-        # (where you then throw away the compiled version!) doesn't make sense at
-        # all.
-        if re.search("^rfc([1-9][0-9]*)$", name):
-            id.viewing_as_rfc = True
-            dw = RfcWrapper(id)
-        else:
-            dw = IdWrapper(id)
-        # XXX Fixme: Eliminate 'dw' as we go forward
-
-    try:
-        b = d.latest_event(BallotDocEvent, type="created_ballot")
-    except BallotDocEvent.DoesNotExist:
-        raise Http404
-
-    return (bw, dw, b, d)
-
-
-def ballot_tsv(request, name):
-    ballot, doc, b, d = get_ballot(name)
-    return HttpResponse(render_to_string('idrfc/ballot.tsv', {'ballot':ballot}, RequestContext(request)), content_type="text/plain")
 
 def ballot_json(request, name):
+    # REDESIGN: this view needs to be deleted or updated
+    def get_ballot(name):
+        from ietf.doc.models import DocAlias
+        alias = get_object_or_404(DocAlias, name=name)
+        d = alias.document
+        from ietf.idtracker.models import InternetDraft, BallotInfo
+        from ietf.idrfc.idrfc_wrapper import BallotWrapper, IdWrapper, RfcWrapper
+        id = None
+        bw = None
+        dw = None
+        if (d.type_id=='draft'):
+            id = get_object_or_404(InternetDraft, name=d.name)
+            try:
+                if not id.ballot.ballot_issued:
+                    raise Http404
+            except BallotInfo.DoesNotExist:
+                raise Http404
+
+            bw = BallotWrapper(id)               # XXX Fixme: Eliminate this as we go forward
+            # Python caches ~100 regex'es -- explicitly compiling it inside a method
+            # (where you then throw away the compiled version!) doesn't make sense at
+            # all.
+            if re.search("^rfc([1-9][0-9]*)$", name):
+                id.viewing_as_rfc = True
+                dw = RfcWrapper(id)
+            else:
+                dw = IdWrapper(id)
+            # XXX Fixme: Eliminate 'dw' as we go forward
+
+        try:
+            b = d.latest_event(BallotDocEvent, type="created_ballot")
+        except BallotDocEvent.DoesNotExist:
+            raise Http404
+
+        return (bw, dw, b, d)
+    
     ballot, doc, b, d = get_ballot(name)
     response = HttpResponse(mimetype='text/plain')
     response.write(json.dumps(ballot.dict(), indent=2))

ietf/idrfc/urls.py

@@ -52,8 +52,7 @@ urlpatterns = patterns('',
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/ballot/$', views_doc.document_ballot, name="doc_ballot"),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/doc.json$', views_doc.document_json),
     (r'^(?P<name>[A-Za-z0-9._+-]+)/ballotpopup/$', views_doc.ballot_for_popup),
-    (r'^(?P<name>[A-Za-z0-9._+-]+)/ballot.tsv$', views_doc.ballot_tsv),
-    (r'^(?P<name>[A-Za-z0-9._+-]+)/ballot.json$', views_doc.ballot_json),
+    #(r'^(?P<name>[A-Za-z0-9._+-]+)/ballot.json$', views_doc.ballot_json), # legacy view
 
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/state/$', views_edit.change_state, name='doc_change_state'), # IESG state
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/state/(?P<state_type>iana-action|iana-review)/$', views_edit.change_iana_state, name='doc_change_iana_state'),

ietf/templates/idrfc/ballot.tsv

@@ -1,2 +0,0 @@
-#Discuss	Yes	No Objection	Abstain	Recuse	No Record
-{% for p in ballot.get_discuss %}{{p.ad_name}}, {% endfor %}	{% for p in ballot.get_yes %}{{p.ad_name}}, {% endfor %}	{% for p in ballot.get_no_objection %}{{p.ad_name}}, {% endfor %}	{% for p in ballot.get_abstain %}{{p.ad_name}}, {% endfor %}	{% for p in ballot.get_recuse %}{{p.ad_name}}, {% endfor %}	{% for p in ballot.get_no_record %}{{p.ad_name}}, {% endfor %}