From a1ea63c16ab5340474a9e38ffbab4108e24eb44b Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 10 Jul 2012 09:52:56 +0000 Subject: [PATCH] Ballot ids are limited to integers, rather than being descriptive as intended at one point. Adjusted the url regexes accordingly. Patch from olau@iola.dk. - Legacy-Id: 4610 --- ietf/idrfc/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf/idrfc/urls.py b/ietf/idrfc/urls.py index d52c72ada..c70c45e30 100644 --- a/ietf/idrfc/urls.py +++ b/ietf/idrfc/urls.py @@ -45,9 +45,9 @@ urlpatterns = patterns('', url(r'^(?P[A-Za-z0-9._+-]+)/((?P[0-9-]+)/)?$', views_doc.document_main, name="doc_view"), url(r'^(?P[A-Za-z0-9._+-]+)/history/$', views_doc.document_history, name="doc_history"), url(r'^(?P[A-Za-z0-9._+-]+)/writeup/$', views_doc.document_writeup, name="doc_writeup"), - url(r'^(?P[A-Za-z0-9._+-]+)/ballot/(?P[A-Za-z0-9.-]+)/position/$', views_ballot.edit_position), - url(r'^(?P[A-Za-z0-9._+-]+)/ballot/(?P[A-Za-z0-9.-]+)/emailposition/$', views_ballot.send_ballot_comment, name='doc_send_ballot_comment'), - url(r'^(?P[A-Za-z0-9._+-]+)/ballot/(?P[A-Za-z0-9.-]+)/$', views_doc.document_ballot, name="doc_ballot"), + url(r'^(?P[A-Za-z0-9._+-]+)/ballot/(?P[0-9]+)/position/$', views_ballot.edit_position), + url(r'^(?P[A-Za-z0-9._+-]+)/ballot/(?P[0-9]+)/emailposition/$', views_ballot.send_ballot_comment, name='doc_send_ballot_comment'), + url(r'^(?P[A-Za-z0-9._+-]+)/ballot/(?P[0-9]+)/$', views_doc.document_ballot, name="doc_ballot"), url(r'^(?P[A-Za-z0-9._+-]+)/ballot/$', views_doc.document_ballot, name="doc_ballot"), (r'^(?P[A-Za-z0-9._+-]+)/doc.json$', views_doc.document_debug), (r'^(?P[A-Za-z0-9._+-]+)/_ballot.data$', views_doc.ballot_html), # why is this url so weird instead of just ballot.html?