Skip to content

Commit 95c2b07

Browse files
committed
Include _ in allowed document name regexp, we currently have 7 drafts
with _ in the database despite it not being valid - they can be found with: select name from doc_document where name like '%\_%' and type_id = "draft"; - Legacy-Id: 4477
1 parent 7538eab commit 95c2b07

1 file changed

Lines changed: 25 additions & 25 deletions

File tree

ietf/idrfc/urls.py

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,33 +42,33 @@
4242
(r'^in-last-call/$', views_search.in_last_call),
4343
url(r'^ad/(?P<name>[A-Za-z0-9.-]+)/$', views_search.by_ad, name="doc_search_by_ad"),
4444

45-
url(r'^(?P<name>[A-Za-z0-9.-]+)/((?P<rev>[0-9-]+)/)?$', views_doc.document_main, name="doc_view"),
46-
url(r'^(?P<name>[A-Za-z0-9.-]+)/history/$', views_doc.document_history, name="doc_history"),
47-
url(r'^(?P<name>[A-Za-z0-9.-]+)/writeup/$', views_doc.document_writeup, name="doc_writeup"),
48-
url(r'^(?P<name>[A-Za-z0-9.-]+)/ballot/(?P<ballot_id>[A-Za-z0-9.-]+)/position/$', views_ballot.edit_position, name='doc_edit_position'),
49-
url(r'^(?P<name>[A-Za-z0-9.-]+)/ballot/(?P<ballot_id>[A-Za-z0-9.-]+)/emailposition/$', views_ballot.send_ballot_comment, name='doc_send_ballot_comment'),
50-
url(r'^(?P<name>[A-Za-z0-9.-]+)/ballot/(?P<ballot_id>[A-Za-z0-9.-]+)/$', views_doc.document_ballot, name="doc_ballot"),
51-
url(r'^(?P<name>[A-Za-z0-9.-]+)/ballot/$', views_doc.document_ballot, name="doc_ballot"),
52-
(r'^(?P<name>[A-Za-z0-9.-]+)/doc.json$', views_doc.document_debug),
53-
(r'^(?P<name>[A-Za-z0-9.-]+)/_ballot.data$', views_doc.ballot_html), # why is this url so weird instead of just ballot.html?
54-
(r'^(?P<name>[A-Za-z0-9.-]+)/ballot.tsv$', views_doc.ballot_tsv),
55-
(r'^(?P<name>[A-Za-z0-9.-]+)/ballot.json$', views_doc.ballot_json),
45+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/((?P<rev>[0-9-]+)/)?$', views_doc.document_main, name="doc_view"),
46+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/history/$', views_doc.document_history, name="doc_history"),
47+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/writeup/$', views_doc.document_writeup, name="doc_writeup"),
48+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/ballot/(?P<ballot_id>[A-Za-z0-9.-]+)/position/$', views_ballot.edit_position, name='doc_edit_position'),
49+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/ballot/(?P<ballot_id>[A-Za-z0-9.-]+)/emailposition/$', views_ballot.send_ballot_comment, name='doc_send_ballot_comment'),
50+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/ballot/(?P<ballot_id>[A-Za-z0-9.-]+)/$', views_doc.document_ballot, name="doc_ballot"),
51+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/ballot/$', views_doc.document_ballot, name="doc_ballot"),
52+
(r'^(?P<name>[A-Za-z0-9.-_]+)/doc.json$', views_doc.document_debug),
53+
(r'^(?P<name>[A-Za-z0-9.-_]+)/_ballot.data$', views_doc.ballot_html), # why is this url so weird instead of just ballot.html?
54+
(r'^(?P<name>[A-Za-z0-9.-_]+)/ballot.tsv$', views_doc.ballot_tsv),
55+
(r'^(?P<name>[A-Za-z0-9.-_]+)/ballot.json$', views_doc.ballot_json),
5656

57-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/state/$', views_edit.change_state, name='doc_change_state'),
58-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/info/$', views_edit.edit_info, name='doc_edit_info'),
59-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/requestresurrect/$', views_edit.request_resurrect, name='doc_request_resurrect'),
60-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/resurrect/$', views_edit.resurrect, name='doc_resurrect'),
61-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/addcomment/$', views_edit.add_comment, name='doc_add_comment'),
62-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/clearballot/$', views_ballot.clear_ballot, name='doc_clear_ballot'),
63-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/deferballot/$', views_ballot.defer_ballot, name='doc_defer_ballot'),
64-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/undeferballot/$', views_ballot.undefer_ballot, name='doc_undefer_ballot'),
65-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/lastcalltext/$', views_ballot.lastcalltext, name='doc_ballot_lastcall'),
66-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/ballotwriteupnotes/$', views_ballot.ballot_writeupnotes, name='doc_ballot_writeupnotes'),
67-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/approvaltext/$', views_ballot.ballot_approvaltext, name='doc_ballot_approvaltext'),
68-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/approveballot/$', views_ballot.approve_ballot, name='doc_approve_ballot'),
69-
url(r'^(?P<name>[A-Za-z0-9.-]+)/edit/makelastcall/$', views_ballot.make_last_call, name='doc_make_last_call'),
57+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/state/$', views_edit.change_state, name='doc_change_state'),
58+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/info/$', views_edit.edit_info, name='doc_edit_info'),
59+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/requestresurrect/$', views_edit.request_resurrect, name='doc_request_resurrect'),
60+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/resurrect/$', views_edit.resurrect, name='doc_resurrect'),
61+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/addcomment/$', views_edit.add_comment, name='doc_add_comment'),
62+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/clearballot/$', views_ballot.clear_ballot, name='doc_clear_ballot'),
63+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/deferballot/$', views_ballot.defer_ballot, name='doc_defer_ballot'),
64+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/undeferballot/$', views_ballot.undefer_ballot, name='doc_undefer_ballot'),
65+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/lastcalltext/$', views_ballot.lastcalltext, name='doc_ballot_lastcall'),
66+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/ballotwriteupnotes/$', views_ballot.ballot_writeupnotes, name='doc_ballot_writeupnotes'),
67+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/approvaltext/$', views_ballot.ballot_approvaltext, name='doc_ballot_approvaltext'),
68+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/approveballot/$', views_ballot.approve_ballot, name='doc_approve_ballot'),
69+
url(r'^(?P<name>[A-Za-z0-9.-_]+)/edit/makelastcall/$', views_ballot.make_last_call, name='doc_make_last_call'),
7070

71-
(r'^(?P<name>[A-Za-z0-9.-]+)/charter/', include('ietf.wgcharter.urls')),
71+
(r'^(?P<name>[A-Za-z0-9.-_]+)/charter/', include('ietf.wgcharter.urls')),
7272
)
7373

7474
urlpatterns += patterns('django.views.generic.simple',

0 commit comments

Comments
 (0)