From 5f053ad21a2b0c1abc66d77cad03ba7e9ef4731e Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 26 Feb 2017 23:21:49 +0000 Subject: [PATCH] Cleaned up the remaining explicit url names, using dotted-paths to view functions instead. In all almost 700 changes. - Legacy-Id: 12923 --- ietf/dbtemplate/urls.py | 4 +- ietf/doc/feeds.py | 4 +- ietf/doc/fields.py | 2 +- ietf/doc/mails.py | 2 +- ietf/doc/templatetags/ietf_filters.py | 2 +- ietf/doc/tests.py | 56 ++++----- ietf/doc/tests_ballot.py | 34 +++--- ietf/doc/tests_charter.py | 22 ++-- ietf/doc/tests_conflict_review.py | 18 +-- ietf/doc/tests_draft.py | 68 +++++------ ietf/doc/tests_material.py | 8 +- ietf/doc/tests_status_change.py | 20 ++-- ietf/doc/urls.py | 106 +++++++++--------- ietf/doc/urls_charter.py | 18 +-- ietf/doc/urls_conflict_review.py | 14 +-- ietf/doc/urls_material.py | 2 +- ietf/doc/urls_status_change.py | 16 +-- ietf/doc/views_ballot.py | 6 +- ietf/doc/views_charter.py | 18 +-- ietf/doc/views_conflict_review.py | 2 +- ietf/doc/views_doc.py | 30 ++--- ietf/doc/views_material.py | 2 +- ietf/doc/views_search.py | 2 +- ietf/doc/views_status_change.py | 2 +- ietf/group/milestones.py | 4 +- ietf/group/tests_info.py | 22 ++-- ietf/group/urls.py | 2 +- ietf/group/urls_info_details.py | 10 +- ietf/group/utils.py | 2 +- ietf/group/views.py | 2 +- ietf/group/views_edit.py | 4 +- ietf/ipr/fields.py | 2 +- ietf/ipr/tests.py | 14 +-- ietf/ipr/urls.py | 20 ++-- ietf/ipr/views.py | 8 +- ietf/liaisons/urls.py | 4 +- ietf/meeting/utils.py | 2 + ietf/nomcom/decorators.py | 2 +- ietf/nomcom/forms.py | 6 +- ietf/nomcom/tests.py | 96 ++++++++-------- ietf/nomcom/urls.py | 55 +++++---- ietf/nomcom/views.py | 10 +- ietf/person/resources.py | 1 + ietf/person/tests.py | 3 + ietf/secr/announcement/tests.py | 10 +- ietf/secr/announcement/urls.py | 4 +- ietf/secr/announcement/views.py | 6 +- ietf/secr/console/urls.py | 2 +- ietf/secr/drafts/tests_views.py | 10 +- ietf/secr/drafts/urls.py | 32 +++--- ietf/secr/drafts/views.py | 24 ++-- ietf/secr/groups/tests.py | 24 ++-- ietf/secr/groups/urls.py | 16 +-- ietf/secr/groups/views.py | 20 ++-- ietf/secr/proceedings/proc_utils.py | 2 +- ietf/secr/proceedings/tests.py | 8 +- ietf/secr/proceedings/urls.py | 12 +- ietf/secr/proceedings/views.py | 12 +- ietf/secr/roles/tests.py | 10 +- ietf/secr/roles/urls.py | 4 +- ietf/secr/roles/views.py | 4 +- ietf/secr/rolodex/tests.py | 4 +- ietf/secr/rolodex/urls.py | 8 +- ietf/secr/rolodex/views.py | 12 +- ietf/secr/telechat/tests.py | 4 +- ietf/secr/telechat/urls.py | 17 ++- ietf/secr/telechat/views.py | 12 +- ietf/secr/templates/areas/view.html | 4 +- ietf/secr/templates/drafts/authors.html | 2 +- ietf/secr/templates/drafts/view.html | 6 +- ietf/secr/templates/groups/people.html | 2 +- ietf/secr/templates/groups/view.html | 12 +- .../includes/group_search_results.html | 2 +- .../includes/proceedings_functions.html | 6 +- .../includes/search_results_table.html | 2 +- .../templates/includes/sessions_footer.html | 2 +- ietf/secr/templates/main.html | 22 ++-- ietf/secr/templates/proceedings/main.html | 2 +- .../secr/templates/proceedings/recording.html | 8 +- .../templates/proceedings/recording_edit.html | 10 +- ietf/secr/templates/proceedings/select.html | 2 +- ietf/secr/templates/proceedings/view.html | 2 +- ietf/secr/templates/roles/main.html | 2 +- ietf/secr/templates/roles/roles.html | 2 +- ietf/secr/templates/rolodex/delete.html | 2 +- ietf/secr/templates/rolodex/view.html | 2 +- .../templates/telechat/base_telechat.html | 14 +-- .../secr/templates/telechat/doc_template.html | 2 +- ietf/secr/urls.py | 4 +- ietf/templates/base.html | 2 +- ietf/templates/base/menu.html | 2 +- ietf/templates/base/menu_user.html | 2 +- ietf/templates/doc/ballot/approvaltext.html | 2 +- ietf/templates/doc/ballot/lastcalltext.html | 2 +- ietf/templates/doc/ballot_popup.html | 6 +- .../doc/charter/action_announcement_text.html | 2 +- ietf/templates/doc/charter/ballot_issued.html | 2 +- .../doc/charter/ballot_writeupnotes.html | 2 +- ietf/templates/doc/charter/change_state.html | 2 +- ietf/templates/doc/conflict_review/start.html | 2 +- .../doc/document_ballot_content.html | 6 +- ietf/templates/doc/document_charter.html | 22 ++-- .../doc/document_conflict_review.html | 12 +- ietf/templates/doc/document_draft.html | 50 ++++----- ietf/templates/doc/document_history.html | 2 +- ietf/templates/doc/document_material.html | 8 +- .../templates/doc/document_referenced_by.html | 6 +- ietf/templates/doc/document_references.html | 6 +- .../templates/doc/document_status_change.html | 18 +-- ietf/templates/doc/draft/change_state.html | 4 +- .../doc/draft/change_stream_state.html | 2 +- ietf/templates/doc/index_active_drafts.html | 4 +- ietf/templates/doc/index_all_drafts.html | 4 +- .../doc/material/choose_material_type.html | 2 +- ietf/templates/doc/search/search_form.html | 2 +- ietf/templates/doc/shepherd_writeup.html | 2 +- .../doc/status_change/last_call.html | 2 +- ietf/templates/doc/status_change/start.html | 2 +- .../doc/status_change/status_changes.html | 2 +- ietf/templates/group/edit_milestones.html | 2 +- .../group/reset_charter_milestones.html | 2 +- .../iesg/milestones_needing_review.html | 2 +- ietf/templates/iesg/moderator_doc.html | 2 +- ietf/templates/ipr/details_history.html | 4 +- ietf/templates/ipr/details_view.html | 10 +- ietf/templates/ipr/list.html | 2 +- ietf/templates/liaisons/edit.html | 4 +- ietf/templates/meeting/materials.html | 2 +- ietf/templates/nomcom/chair_help.html | 4 +- ietf/templates/nomcom/feedback.html | 2 +- ietf/templates/nomcom/list_positions.html | 8 +- ietf/templates/nomcom/list_templates.html | 4 +- .../templates/nomcom/nomcom_private_base.html | 28 ++--- ietf/templates/nomcom/nomcom_public_base.html | 10 +- ietf/templates/nomcom/private_index.html | 2 +- ietf/templates/nomcom/remove_position.html | 2 +- ietf/templates/nomcom/send_reminder_mail.html | 2 +- ietf/templates/nomcom/view_feedback.html | 2 +- .../nomcom/view_feedback_nominee.html | 2 +- .../nomcom/view_feedback_pending.html | 2 +- .../nomcom/view_feedback_unrelated.html | 2 +- ietf/templates/sync/rfceditor_undo.html | 2 +- ietf/utils/urls.py | 2 - 143 files changed, 692 insertions(+), 690 deletions(-) diff --git a/ietf/dbtemplate/urls.py b/ietf/dbtemplate/urls.py index 86bba648e..cdf7f7529 100644 --- a/ietf/dbtemplate/urls.py +++ b/ietf/dbtemplate/urls.py @@ -4,6 +4,6 @@ from ietf.dbtemplate import views from ietf.utils.urls import url urlpatterns = [ - url(r'^(?P[-a-z0-9]+)/$', views.template_list, name='template_list'), - url(r'^(?P[-a-z0-9]+)/(?P[\d]+)/$', views.template_edit, name='template_edit'), + url(r'^(?P[-a-z0-9]+)/$', views.template_list), + url(r'^(?P[-a-z0-9]+)/(?P[\d]+)/$', views.template_edit), ] diff --git a/ietf/doc/feeds.py b/ietf/doc/feeds.py index 30c41a09c..68eec67c3 100644 --- a/ietf/doc/feeds.py +++ b/ietf/doc/feeds.py @@ -24,7 +24,7 @@ class DocumentChangesFeed(Feed): def link(self, obj): if obj is None: raise FeedDoesNotExist - return urlreverse("doc_history", kwargs=dict(name=obj.canonical_name())) + return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=obj.canonical_name())) def subtitle(self, obj): return "History of change entries for %s." % obj.display_name() @@ -47,7 +47,7 @@ class DocumentChangesFeed(Feed): return unicode(item.by) def item_link(self, item): - return urlreverse("doc_history", kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk + return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk class InLastCallFeed(Feed): title = "Documents in Last Call" diff --git a/ietf/doc/fields.py b/ietf/doc/fields.py index 09d16b7c1..ee69404a5 100644 --- a/ietf/doc/fields.py +++ b/ietf/doc/fields.py @@ -67,7 +67,7 @@ class SearchableDocumentsField(forms.CharField): # doing this in the constructor is difficult because the URL # patterns may not have been fully constructed there yet - self.widget.attrs["data-ajax-url"] = urlreverse("ajax_select2_search_docs", kwargs={ + self.widget.attrs["data-ajax-url"] = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={ "doc_type": self.doc_type, "model_name": self.model.__name__.lower() }) diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py index 2849c7169..c4e6f1f97 100644 --- a/ietf/doc/mails.py +++ b/ietf/doc/mails.py @@ -500,7 +500,7 @@ def send_review_possibly_replaces_request(request, doc, submitter_info): dict(doc= doc, submitter_info=submitter_info, possibly_replaces=doc.related_that_doc("possibly-replaces"), - review_url=settings.IDTRACKER_BASE_URL + urlreverse("doc_review_possibly_replaces", kwargs={ "name": doc.name })), + review_url=settings.IDTRACKER_BASE_URL + urlreverse('ietf.doc.views_draft.review_possibly_replaces', kwargs={ "name": doc.name })), cc=list(cc),) def email_charter_internal_review(request, charter): diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py index e21661d74..1deca4466 100644 --- a/ietf/doc/templatetags/ietf_filters.py +++ b/ietf/doc/templatetags/ietf_filters.py @@ -449,7 +449,7 @@ def statehelp(state): "Output help icon with tooltip for state." from django.core.urlresolvers import reverse as urlreverse tooltip = escape(strip_tags(state.desc)) - url = urlreverse("state_help", kwargs=dict(type=state.type_id)) + "#" + state.slug + url = urlreverse('ietf.doc.views_help.state_help', kwargs=dict(type=state.type_id)) + "#" + state.slug return mark_safe('?' % (url, tooltip)) @register.filter diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py index d1e59c7fa..d1dd8cfce 100644 --- a/ietf/doc/tests.py +++ b/ietf/doc/tests.py @@ -40,7 +40,7 @@ class SearchTests(TestCase): def test_search(self): draft = make_test_data() - base_url = urlreverse("doc_search") + base_url = urlreverse('ietf.doc.views_search.search') # only show form, no search yet r = self.client.get(base_url) @@ -126,72 +126,72 @@ class SearchTests(TestCase): draft.save_with_history([DocEvent.objects.create(doc=draft, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")]) # exact match - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) # prefix match - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(draft.name.split("-")[:-1])))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(draft.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) # non-prefix match - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(draft.name.split("-")[1:])))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(draft.name.split("-")[1:])))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) # other doctypes than drafts doc = Document.objects.get(name='charter-ietf-mars') - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name='charter-ietf-ma'))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name='charter-ietf-ma'))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) doc = Document.objects.filter(name__startswith='conflict-review-').first() - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) doc = Document.objects.filter(name__startswith='status-change-').first() - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) doc = Document.objects.filter(name__startswith='agenda-').first() - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) doc = Document.objects.filter(name__startswith='minutes-').first() - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) doc = Document.objects.filter(name__startswith='slides-').first() - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) # match with revision - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name + "-" + prev_rev))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-" + prev_rev))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev))) # match with non-existing revision - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name + "-09"))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-09"))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) # match with revision and extension - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name=draft.name + "-" + prev_rev + ".txt"))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-" + prev_rev + ".txt"))) self.assertEqual(r.status_code, 302) self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev))) # no match - r = self.client.get(urlreverse("doc_search_for_name", kwargs=dict(name="draft-ietf-doesnotexist-42"))) + r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="draft-ietf-doesnotexist-42"))) self.assertEqual(r.status_code, 302) parsed = urlparse.urlparse(r["Location"]) - self.assertEqual(parsed.path, urlreverse("doc_search")) + self.assertEqual(parsed.path, urlreverse('ietf.doc.views_search.search')) self.assertEqual(urlparse.parse_qs(parsed.query)["name"][0], "draft-ietf-doesnotexist-42") def test_frontpage(self): @@ -203,23 +203,23 @@ class SearchTests(TestCase): def test_drafts_pages(self): draft = make_test_data() - r = self.client.get(urlreverse("docs_for_ad", kwargs=dict(name=draft.ad.full_name_as_key()))) + r = self.client.get(urlreverse('ietf.doc.views_search.docs_for_ad', kwargs=dict(name=draft.ad.full_name_as_key()))) self.assertEqual(r.status_code, 200) self.assertTrue(draft.title in unicontent(r)) draft.set_state(State.objects.get(type="draft-iesg", slug="lc")) - r = self.client.get(urlreverse("drafts_in_last_call")) + r = self.client.get(urlreverse('ietf.doc.views_search.drafts_in_last_call')) self.assertEqual(r.status_code, 200) self.assertTrue(draft.title in unicontent(r)) def test_indexes(self): draft = make_test_data() - r = self.client.get(urlreverse("index_all_drafts")) + r = self.client.get(urlreverse('ietf.doc.views_search.index_all_drafts')) self.assertEqual(r.status_code, 200) self.assertTrue(draft.name in unicontent(r)) - r = self.client.get(urlreverse("index_active_drafts")) + r = self.client.get(urlreverse('ietf.doc.views_search.index_active_drafts')) self.assertEqual(r.status_code, 200) self.assertTrue(draft.title in unicontent(r)) @@ -227,7 +227,7 @@ class SearchTests(TestCase): draft = make_test_data() # Document - url = urlreverse("ajax_select2_search_docs", kwargs={ + url = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={ "model_name": "document", "doc_type": "draft", }) @@ -239,7 +239,7 @@ class SearchTests(TestCase): # DocAlias doc_alias = draft.docalias_set.get() - url = urlreverse("ajax_select2_search_docs", kwargs={ + url = urlreverse('ietf.doc.views_search.ajax_select2_search_docs', kwargs={ "model_name": "docalias", "doc_type": "draft", }) @@ -734,7 +734,7 @@ class DocTestCase(TestCase): text="This is a note for the RFC Editor.", by=Person.objects.get(name="(System)")) - url = urlreverse('doc_writeup', kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_doc.document_writeup', kwargs=dict(name=doc.name)) r = self.client.get(url) self.assertEqual(r.status_code, 200) self.assertTrue(appr.text in unicontent(r)) @@ -750,7 +750,7 @@ class DocTestCase(TestCase): type="added_comment", by=Person.objects.get(name="(System)")) - url = urlreverse('doc_history', kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=doc.name)) r = self.client.get(url) self.assertEqual(r.status_code, 200) self.assertTrue(e.desc in unicontent(r)) @@ -790,7 +790,7 @@ class DocTestCase(TestCase): self.assertTrue(r.status_code, 200) def test_state_help(self): - url = urlreverse('state_help', kwargs=dict(type="draft-iesg")) + url = urlreverse('ietf.doc.views_help.state_help', kwargs=dict(type="draft-iesg")) r = self.client.get(url) self.assertEqual(r.status_code, 200) self.assertTrue(State.objects.get(type="draft-iesg", slug="lc").name in unicontent(r)) @@ -871,7 +871,7 @@ class DocTestCase(TestCase): class AddCommentTestCase(TestCase): def test_add_comment(self): draft = make_test_data() - url = urlreverse('doc_add_comment', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_doc.add_comment', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -919,11 +919,11 @@ class ReferencesTest(TestCase): doc1 = Document.objects.get(name='draft-ietf-mars-test') doc2 = DocAlias.objects.get(name='draft-imaginary-independent-submission') RelatedDocument.objects.get_or_create(source=doc1,target=doc2,relationship=DocRelationshipName.objects.get(slug='refnorm')) - url = urlreverse('doc_references', kwargs=dict(name=doc1.name)) + url = urlreverse('ietf.doc.views_doc.document_references', kwargs=dict(name=doc1.name)) r = self.client.get(url) self.assertEquals(r.status_code, 200) self.assertTrue(doc2.name in unicontent(r)) - url = urlreverse('doc_referenced_by', kwargs=dict(name=doc2.name)) + url = urlreverse('ietf.doc.views_doc.document_referenced_by', kwargs=dict(name=doc2.name)) r = self.client.get(url) self.assertEquals(r.status_code, 200) self.assertTrue(doc1.name in unicontent(r)) @@ -963,7 +963,7 @@ expand-draft-ietf-ames-test.all@virtual.ietf.org ames-author@example.ames, ames os.unlink(self.doc_alias_file.name) def testAliases(self): - url = urlreverse('doc_specific_email_aliases', kwargs=dict(name="draft-ietf-mars-test")) + url = urlreverse('ietf.doc.urls.redirect.document_email', kwargs=dict(name="draft-ietf-mars-test")) r = self.client.get(url) self.assertEqual(r.status_code, 302) diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py index 9c8c39565..ec859857c 100644 --- a/ietf/doc/tests_ballot.py +++ b/ietf/doc/tests_ballot.py @@ -141,7 +141,7 @@ class EditPositionTests(TestCase): comment="Test!", comment_time=datetime.datetime.now()) - url = urlreverse('doc_send_ballot_comment', kwargs=dict(name=draft.name, + url = urlreverse('ietf.doc.views_ballot.send_ballot_comment', kwargs=dict(name=draft.name, ballot_id=ballot.pk)) login_testing_unauthorized(self, "ad", url) @@ -185,7 +185,7 @@ class EditPositionTests(TestCase): class BallotWriteupsTests(TestCase): def test_edit_last_call_text(self): draft = make_test_data() - url = urlreverse('doc_ballot_lastcall', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.lastcalltext', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -225,7 +225,7 @@ class BallotWriteupsTests(TestCase): def test_request_last_call(self): draft = make_test_data() - url = urlreverse('doc_ballot_lastcall', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.lastcalltext', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # give us an announcement to send @@ -250,7 +250,7 @@ class BallotWriteupsTests(TestCase): def test_edit_ballot_writeup(self): draft = make_test_data() - url = urlreverse('doc_ballot_writeupnotes', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # add a IANA review note @@ -279,7 +279,7 @@ class BallotWriteupsTests(TestCase): def test_edit_ballot_rfceditornote(self): draft = make_test_data() - url = urlreverse('doc_ballot_rfceditornote', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.ballot_rfceditornote', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # add a note to the RFC Editor @@ -318,7 +318,7 @@ class BallotWriteupsTests(TestCase): def test_issue_ballot(self): draft = make_test_data() - url = urlreverse('doc_ballot_writeupnotes', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.ballot_writeupnotes', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "ad", url) @@ -340,7 +340,7 @@ class BallotWriteupsTests(TestCase): def test_edit_approval_text(self): draft = make_test_data() - url = urlreverse('doc_ballot_approvaltext', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.ballot_approvaltext', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -427,7 +427,7 @@ class BallotWriteupsTests(TestCase): events.append(e) # IETF Stream Documents - for p in ['doc_ballot_approvaltext','doc_ballot_writeupnotes','doc_ballot_rfceditornote']: + for p in ['ietf.doc.views_ballot.ballot_approvaltext','ietf.doc.views_ballot.ballot_writeupnotes','ietf.doc.views_ballot.ballot_rfceditornote']: url = urlreverse(p, kwargs=dict(name=draft.name)) for username in ['plain','marschairman','iab chair','irtf chair','ise','iana']: @@ -439,7 +439,7 @@ class BallotWriteupsTests(TestCase): # RFC Editor Notes for documents in the IAB Stream draft.stream_id = 'iab' draft.save_with_history(events) - url = urlreverse('doc_ballot_rfceditornote', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.ballot_rfceditornote', kwargs=dict(name=draft.name)) for username in ['plain','marschairman','ad','irtf chair','ise','iana']: verify_fail(username, url) @@ -454,7 +454,7 @@ class BallotWriteupsTests(TestCase): draft.stream_id = 'irtf' draft.save_with_history([e]) - url = urlreverse('doc_ballot_rfceditornote', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.ballot_rfceditornote', kwargs=dict(name=draft.name)) for username in ['plain','marschairman','ad','iab chair','ise','iana']: verify_fail(username, url) @@ -469,7 +469,7 @@ class BallotWriteupsTests(TestCase): draft.stream_id = 'ise' draft.save_with_history([e]) - url = urlreverse('doc_ballot_rfceditornote', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.ballot_rfceditornote', kwargs=dict(name=draft.name)) for username in ['plain','marschairman','ad','iab chair','irtf chair','iana']: verify_fail(username, url) @@ -482,7 +482,7 @@ class ApproveBallotTests(TestCase): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva")) # make sure it's approvable - url = urlreverse('doc_approve_ballot', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.approve_ballot', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -532,7 +532,7 @@ class ApproveBallotTests(TestCase): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="nopubadw")) - url = urlreverse('doc_approve_ballot', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.approve_ballot', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # disapprove (the Martians aren't going to be happy) @@ -551,7 +551,7 @@ class MakeLastCallTests(TestCase): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="lc-req")) - url = urlreverse('doc_make_last_call', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.make_last_call', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -591,7 +591,7 @@ class DeferUndeferTestCase(TestCase): def helper_test_defer(self,name): doc = Document.objects.get(name=name) - url = urlreverse('doc_defer_ballot',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_ballot.defer_ballot',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -651,7 +651,7 @@ class DeferUndeferTestCase(TestCase): def helper_test_undefer(self,name): doc = Document.objects.get(name=name) - url = urlreverse('doc_undefer_ballot',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_ballot.undefer_ballot',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -735,7 +735,7 @@ class RegenerateLastCallTestCase(TestCase): intended_std_level_id='ps', ) - url = urlreverse('doc_ballot_lastcall', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_ballot.lastcalltext', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) r = self.client.get(url) self.assertEqual(r.status_code, 200) diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py index 62e03dfe3..397d535cd 100644 --- a/ietf/doc/tests_charter.py +++ b/ietf/doc/tests_charter.py @@ -46,7 +46,7 @@ class EditCharterTests(TestCase): for option in ("recharter", "abandon"): self.client.logout() - url = urlreverse('charter_startstop_process', kwargs=dict(name=charter.name, option=option)) + url = urlreverse('ietf.doc.views_charter.change_state', kwargs=dict(name=charter.name, option=option)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -69,7 +69,7 @@ class EditCharterTests(TestCase): group = Group.objects.get(acronym="ames") charter = group.charter - url = urlreverse('charter_change_state', kwargs=dict(name=charter.name)) + url = urlreverse('ietf.doc.views_charter.change_state', kwargs=dict(name=charter.name)) login_testing_unauthorized(self, "secretary", url) first_state = charter.get_state() @@ -149,7 +149,7 @@ class EditCharterTests(TestCase): # Exercise internal review of a recharter group = Group.objects.get(acronym="mars") charter = group.charter - url = urlreverse('charter_change_state', kwargs=dict(name=charter.name)) + url = urlreverse('ietf.doc.views_charter.change_state', kwargs=dict(name=charter.name)) empty_outbox() r = self.client.post(url, dict(charter_state=str(State.objects.get(used=True,type="charter",slug="intrev").pk), message="test")) self.assertEqual(r.status_code, 302) @@ -161,7 +161,7 @@ class EditCharterTests(TestCase): group = Group.objects.get(acronym="mars") charter = group.charter - url = urlreverse('charter_telechat_date', kwargs=dict(name=charter.name)) + url = urlreverse('ietf.doc.views_doc.telechat_date;charter', kwargs=dict(name=charter.name)) login_testing_unauthorized(self, "secretary", url) # get @@ -199,7 +199,7 @@ class EditCharterTests(TestCase): group = Group.objects.get(acronym="ames") charter = group.charter - url = urlreverse('charter_telechat_date', kwargs=dict(name=charter.name)) + url = urlreverse('ietf.doc.views_doc.telechat_date;charter', kwargs=dict(name=charter.name)) login_testing_unauthorized(self, "secretary", url) login = Person.objects.get(user__username="secretary") @@ -228,7 +228,7 @@ class EditCharterTests(TestCase): charter = Group.objects.get(acronym="mars").charter - url = urlreverse('charter_edit_notify', kwargs=dict(name=charter.name)) + url = urlreverse('ietf.doc.views_doc.edit_notify;charter', kwargs=dict(name=charter.name)) login_testing_unauthorized(self, "secretary", url) # get @@ -259,7 +259,7 @@ class EditCharterTests(TestCase): charter = Group.objects.get(acronym="mars").charter - url = urlreverse('charter_edit_ad', kwargs=dict(name=charter.name)) + url = urlreverse('ietf.doc.views_charter.edit_ad', kwargs=dict(name=charter.name)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -283,7 +283,7 @@ class EditCharterTests(TestCase): group = Group.objects.get(acronym="mars") charter = group.charter - url = urlreverse('charter_submit', kwargs=dict(name=charter.name)) + url = urlreverse('ietf.doc.views_charter.submit', kwargs=dict(name=charter.name)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -330,7 +330,7 @@ class EditCharterTests(TestCase): charter.delete() charter = None - url = urlreverse('charter_submit', kwargs=dict(name=charter_name_for_group(group))) + url = urlreverse('ietf.doc.views_charter.submit', kwargs=dict(name=charter_name_for_group(group))) login_testing_unauthorized(self, "secretary", url) # normal get @@ -495,7 +495,7 @@ class EditCharterTests(TestCase): group = Group.objects.get(acronym="ames") charter = group.charter - url = urlreverse('charter_approve', kwargs=dict(name=charter.name)) + url = urlreverse('ietf.doc.views_charter.approve', kwargs=dict(name=charter.name)) login_testing_unauthorized(self, "secretary", url) self.write_charter_file(charter) @@ -594,7 +594,7 @@ class EditCharterTests(TestCase): due=datetime.date.today(), resolved="") - url = urlreverse('charter_with_milestones_txt', kwargs=dict(name=charter.name, rev=charter.rev)) + url = urlreverse('ietf.doc.views_charter.charter_with_milestones_txt', kwargs=dict(name=charter.name, rev=charter.rev)) r = self.client.get(url) self.assertEqual(r.status_code, 200) self.assertTrue(m.desc in unicontent(r)) diff --git a/ietf/doc/tests_conflict_review.py b/ietf/doc/tests_conflict_review.py index 5c69ae9a4..c4f0636e3 100644 --- a/ietf/doc/tests_conflict_review.py +++ b/ietf/doc/tests_conflict_review.py @@ -25,7 +25,7 @@ class ConflictReviewTests(TestCase): def test_start_review_as_secretary(self): doc = Document.objects.get(name='draft-imaginary-independent-submission') - url = urlreverse('conflict_review_start',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_conflict_review.start_review',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "secretary", url) @@ -80,7 +80,7 @@ class ConflictReviewTests(TestCase): def test_start_review_as_stream_owner(self): doc = Document.objects.get(name='draft-imaginary-independent-submission') - url = urlreverse('conflict_review_start',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_conflict_review.start_review',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ise-chair", url) @@ -129,7 +129,7 @@ class ConflictReviewTests(TestCase): def test_change_state(self): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - url = urlreverse('conflict_review_change_state',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_conflict_review.change_state',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -167,7 +167,7 @@ class ConflictReviewTests(TestCase): def test_edit_notices(self): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - url = urlreverse('conflict_review_notices',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_doc.edit_notify;conflict-review',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -197,7 +197,7 @@ class ConflictReviewTests(TestCase): def test_edit_ad(self): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - url = urlreverse('conflict_review_ad',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_conflict_review.edit_ad',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -218,7 +218,7 @@ class ConflictReviewTests(TestCase): def test_edit_telechat_date(self): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - url = urlreverse('conflict_review_telechat_date',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_doc.telechat_date;conflict-review',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -263,7 +263,7 @@ class ConflictReviewTests(TestCase): def approve_test_helper(self,approve_type): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - url = urlreverse('conflict_review_approve',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_conflict_review.approve',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "secretary", url) @@ -314,7 +314,7 @@ class ConflictReviewTests(TestCase): class ConflictReviewSubmitTests(TestCase): def test_initial_submission(self): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - url = urlreverse('conflict_review_submit',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_conflict_review.submit',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) # normal get @@ -341,7 +341,7 @@ class ConflictReviewSubmitTests(TestCase): def test_subsequent_submission(self): doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - url = urlreverse('conflict_review_submit',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_conflict_review.submit',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) # A little additional setup diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py index 1f024b0ed..aa81bb80e 100644 --- a/ietf/doc/tests_draft.py +++ b/ietf/doc/tests_draft.py @@ -32,7 +32,7 @@ class ChangeStateTests(TestCase): draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="iesg-eva")) draft.tags.add("point") - url = urlreverse('doc_change_state', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.change_state', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "ad", url) # normal get @@ -71,7 +71,7 @@ class ChangeStateTests(TestCase): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="ad-eval")) - url = urlreverse('doc_change_state', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.change_state', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) first_state = draft.get_state("draft-iesg") @@ -130,7 +130,7 @@ class ChangeStateTests(TestCase): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="rfcqueue")) - url = urlreverse('doc_change_state', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.change_state', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # change state @@ -165,7 +165,7 @@ class ChangeStateTests(TestCase): next_state = State.objects.get(used=True, type="draft-iana-review", slug="ok-noact") draft.set_state(first_state) - url = urlreverse('doc_change_iana_state', kwargs=dict(name=draft.name, state_type="iana-review")) + url = urlreverse('ietf.doc.views_draft.change_iana_state', kwargs=dict(name=draft.name, state_type="iana-review")) login_testing_unauthorized(self, "iana", url) # normal get @@ -194,7 +194,7 @@ class ChangeStateTests(TestCase): draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="ad-eval")) self.client.login(username="secretary", password="secretary+password") - url = urlreverse('doc_change_state', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.change_state', kwargs=dict(name=draft.name)) empty_outbox() @@ -238,7 +238,7 @@ class ChangeStateTests(TestCase): class EditInfoTests(TestCase): def test_edit_info(self): draft = make_test_data() - url = urlreverse('doc_edit_info', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.edit_info', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -283,7 +283,7 @@ class EditInfoTests(TestCase): def test_edit_telechat_date(self): draft = make_test_data() - url = urlreverse('doc_edit_info', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.edit_info', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) data = dict(intended_std_level=str(draft.intended_std_level_id), @@ -381,7 +381,7 @@ class EditInfoTests(TestCase): order=1 ) - url = urlreverse('doc_edit_info', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.edit_info', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -440,7 +440,7 @@ class EditInfoTests(TestCase): def test_edit_consensus(self): draft = make_test_data() - url = urlreverse('doc_edit_consensus', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.edit_consensus', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) # get @@ -481,7 +481,7 @@ class ResurrectTests(TestCase): draft = make_test_data() draft.set_state(State.objects.get(used=True, type="draft", slug="expired")) - url = urlreverse('doc_request_resurrect', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.request_resurrect', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "ad", url) @@ -517,7 +517,7 @@ class ResurrectTests(TestCase): type="requested_resurrect", by=Person.objects.get(name="Areað Irector")) - url = urlreverse('doc_resurrect', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.resurrect', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "secretary", url) @@ -773,7 +773,7 @@ class ExpireLastCallTests(TestCase): class IndividualInfoFormsTests(TestCase): def test_doc_change_stream(self): - url = urlreverse('doc_change_stream', kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_draft.change_stream', kwargs=dict(name=self.docname)) login_testing_unauthorized(self, "secretary", url) # get @@ -804,7 +804,7 @@ class IndividualInfoFormsTests(TestCase): self.assertTrue('rfc-ise@' in outbox[0]['To']) def test_doc_change_notify(self): - url = urlreverse('doc_change_notify', kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_doc.edit_notify', kwargs=dict(name=self.docname)) login_testing_unauthorized(self, "secretary", url) # get @@ -829,7 +829,7 @@ class IndividualInfoFormsTests(TestCase): self.assertEqual(None,q('form input[name=notify]')[0].value) def test_doc_change_intended_status(self): - url = urlreverse('doc_change_intended_status', kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_draft.change_intention', kwargs=dict(name=self.docname)) login_testing_unauthorized(self, "secretary", url) # get @@ -858,7 +858,7 @@ class IndividualInfoFormsTests(TestCase): self.assertTrue('ZpyQFGmA' in self.doc.latest_event(DocEvent,type='added_comment').desc) def test_doc_change_telechat_date(self): - url = urlreverse('doc_change_telechat_date', kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_doc.telechat_date', kwargs=dict(name=self.docname)) login_testing_unauthorized(self, "secretary", url) # get @@ -886,7 +886,7 @@ class IndividualInfoFormsTests(TestCase): self.assertEqual(self.doc.latest_event(TelechatDocEvent, "scheduled_for_telechat").telechat_date,None) def test_doc_change_iesg_note(self): - url = urlreverse('doc_change_iesg_note', kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_draft.edit_iesg_note', kwargs=dict(name=self.docname)) login_testing_unauthorized(self, "secretary", url) # get @@ -903,7 +903,7 @@ class IndividualInfoFormsTests(TestCase): self.assertTrue('ZpyQFGmA' in self.doc.latest_event(DocEvent,type='added_comment').desc) def test_doc_change_ad(self): - url = urlreverse('doc_change_ad', kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_draft.edit_ad', kwargs=dict(name=self.docname)) login_testing_unauthorized(self, "secretary", url) # get @@ -924,7 +924,7 @@ class IndividualInfoFormsTests(TestCase): self.doc.shepherd = None self.doc.save_with_history([DocEvent.objects.create(doc=self.doc, type="changed_shepherd", by=Person.objects.get(user__username="secretary"), desc="Test")]) - url = urlreverse('doc_edit_shepherd',kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_draft.edit_shepherd',kwargs=dict(name=self.docname)) login_testing_unauthorized(self, "plain", url) @@ -976,7 +976,7 @@ class IndividualInfoFormsTests(TestCase): self.doc.shepherd = None self.doc.save_with_history([DocEvent.objects.create(doc=self.doc, type="changed_shepherd", by=Person.objects.get(user__username="secretary"), desc="Test")]) - url = urlreverse('doc_change_shepherd_email',kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_draft.change_shepherd_email',kwargs=dict(name=self.docname)) r = self.client.get(url) self.assertEqual(r.status_code, 404) @@ -1008,7 +1008,7 @@ class IndividualInfoFormsTests(TestCase): def test_doc_view_shepherd_writeup(self): - url = urlreverse('doc_shepherd_writeup',kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_doc.document_shepherd_writeup',kwargs=dict(name=self.docname)) # get as a shepherd self.client.login(username="plain", password="plain+password") @@ -1028,7 +1028,7 @@ class IndividualInfoFormsTests(TestCase): self.assertEqual(len(q('#content a:contains("Edit")')), 0) def test_doc_change_shepherd_writeup(self): - url = urlreverse('doc_edit_shepherd_writeup',kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_draft.edit_shepherd_writeup',kwargs=dict(name=self.docname)) # get login_testing_unauthorized(self, "secretary", url) @@ -1079,7 +1079,7 @@ class SubmitToIesgTests(TestCase): q = PyQuery(r.content) self.assertEqual(len(q('form input[name="confirm"]')),1) - url = urlreverse('doc_to_iesg', kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_draft.to_iesg', kwargs=dict(name=self.docname)) for username in [None,'plain','iana','iab chair']: verify_fail(username) @@ -1088,7 +1088,7 @@ class SubmitToIesgTests(TestCase): verify_can_see(username) def test_cancel_submission(self): - url = urlreverse('doc_to_iesg', kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_draft.to_iesg', kwargs=dict(name=self.docname)) self.client.login(username="marschairman", password="marschairman+password") r = self.client.post(url, dict(cancel="1")) @@ -1098,7 +1098,7 @@ class SubmitToIesgTests(TestCase): self.assertTrue(doc.get_state('draft-iesg')==None) def test_confirm_submission(self): - url = urlreverse('doc_to_iesg', kwargs=dict(name=self.docname)) + url = urlreverse('ietf.doc.views_draft.to_iesg', kwargs=dict(name=self.docname)) self.client.login(username="marschairman", password="marschairman+password") docevent_count_pre = self.doc.docevent_set.count() @@ -1133,7 +1133,7 @@ class RequestPublicationTests(TestCase): draft.save_with_history([DocEvent.objects.create(doc=draft, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")]) draft.set_state(State.objects.get(used=True, type="draft-stream-iab", slug="approved")) - url = urlreverse('doc_request_publication', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.request_publication', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "iab-chair", url) # normal get @@ -1173,7 +1173,7 @@ class AdoptDraftTests(TestCase): draft.unset_state("draft-stream-ietf") draft.save_with_history([DocEvent.objects.create(doc=draft, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")]) - url = urlreverse('doc_adopt_draft', kwargs=dict(name=draft.name)) + url = urlreverse('ietf.doc.views_draft.adopt_draft', kwargs=dict(name=draft.name)) login_testing_unauthorized(self, "marschairman", url) # get @@ -1213,7 +1213,7 @@ class ChangeStreamStateTests(TestCase): draft.tags = DocTagName.objects.filter(slug="w-expert") draft.group.unused_tags.add("w-refdoc") - url = urlreverse('doc_change_stream_state', kwargs=dict(name=draft.name, state_type="draft-stream-ietf")) + url = urlreverse('ietf.doc.views_draft.change_stream_state', kwargs=dict(name=draft.name, state_type="draft-stream-ietf")) login_testing_unauthorized(self, "marschairman", url) # get @@ -1252,7 +1252,7 @@ class ChangeStreamStateTests(TestCase): draft = make_test_data() draft.unset_state("draft-stream-%s"%draft.stream_id) - url = urlreverse('doc_change_stream_state', kwargs=dict(name=draft.name, state_type="draft-stream-ietf")) + url = urlreverse('ietf.doc.views_draft.change_stream_state', kwargs=dict(name=draft.name, state_type="draft-stream-ietf")) login_testing_unauthorized(self, "marschairman", url) # set a state when no state exists @@ -1285,7 +1285,7 @@ class ChangeStreamStateTests(TestCase): def test_set_state(self): draft = make_test_data() - url = urlreverse('doc_change_stream_state', kwargs=dict(name=draft.name, state_type="draft-stream-ietf")) + url = urlreverse('ietf.doc.views_draft.change_stream_state', kwargs=dict(name=draft.name, state_type="draft-stream-ietf")) login_testing_unauthorized(self, "marschairman", url) # get @@ -1328,7 +1328,7 @@ class ChangeStreamStateTests(TestCase): def test_pubreq_validation(self): draft = make_test_data() - url = urlreverse('doc_change_stream_state', kwargs=dict(name=draft.name, state_type="draft-stream-ietf")) + url = urlreverse('ietf.doc.views_draft.change_stream_state', kwargs=dict(name=draft.name, state_type="draft-stream-ietf")) login_testing_unauthorized(self, "marschairman", url) old_state = draft.get_state("draft-stream-%s" % draft.stream_id ) @@ -1408,7 +1408,7 @@ class ChangeReplacesTests(TestCase): def test_change_replaces(self): - url = urlreverse('doc_change_replaces', kwargs=dict(name=self.replacea.name)) + url = urlreverse('ietf.doc.views_draft.replaces', kwargs=dict(name=self.replacea.name)) login_testing_unauthorized(self, "secretary", url) # normal get @@ -1434,7 +1434,7 @@ class ChangeReplacesTests(TestCase): empty_outbox() # Post that says replaceboth replaces both base a and base b - url = urlreverse('doc_change_replaces', kwargs=dict(name=self.replaceboth.name)) + url = urlreverse('ietf.doc.views_draft.replaces', kwargs=dict(name=self.replaceboth.name)) self.assertEqual(self.baseb.get_state().slug,'expired') r = self.client.post(url, dict(replaces=self.basea.name + "," + self.baseb.name)) self.assertEqual(r.status_code, 302) @@ -1458,7 +1458,7 @@ class ChangeReplacesTests(TestCase): # Post that undoes replacea empty_outbox() - url = urlreverse('doc_change_replaces', kwargs=dict(name=self.replacea.name)) + url = urlreverse('ietf.doc.views_draft.replaces', kwargs=dict(name=self.replacea.name)) r = self.client.post(url, dict(replaces="")) self.assertEqual(r.status_code, 302) self.assertEqual(Document.objects.get(name='draft-test-base-a').get_state().slug,'active') @@ -1471,7 +1471,7 @@ class ChangeReplacesTests(TestCase): RelatedDocument.objects.create(source=self.replacea, target=replaced, relationship=DocRelationshipName.objects.get(slug="possibly-replaces")) - url = urlreverse('doc_review_possibly_replaces', kwargs=dict(name=self.replacea.name)) + url = urlreverse('ietf.doc.views_draft.review_possibly_replaces', kwargs=dict(name=self.replacea.name)) login_testing_unauthorized(self, "secretary", url) r = self.client.get(url) diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py index 364bcbada..06069fc45 100644 --- a/ietf/doc/tests_material.py +++ b/ietf/doc/tests_material.py @@ -72,7 +72,7 @@ class GroupMaterialTests(TestCase): def test_upload_slides(self): group = Group.objects.create(type_id="team", acronym="testteam", name="Test Team", state_id="active") - url = urlreverse('group_new_material', kwargs=dict(acronym=group.acronym, doc_type="slides")) + url = urlreverse('ietf.doc.views_material.edit_material', kwargs=dict(acronym=group.acronym, doc_type="slides")) login_testing_unauthorized(self, "secretary", url) # normal get @@ -121,7 +121,7 @@ class GroupMaterialTests(TestCase): def test_change_state(self): doc = self.create_slides() - url = urlreverse('material_edit', kwargs=dict(name=doc.name, action="state")) + url = urlreverse('ietf.doc.views_material.edit_material', kwargs=dict(name=doc.name, action="state")) login_testing_unauthorized(self, "secretary", url) # post @@ -133,7 +133,7 @@ class GroupMaterialTests(TestCase): def test_edit_title(self): doc = self.create_slides() - url = urlreverse('material_edit', kwargs=dict(name=doc.name, action="title")) + url = urlreverse('ietf.doc.views_material.edit_material', kwargs=dict(name=doc.name, action="title")) login_testing_unauthorized(self, "secretary", url) # post @@ -156,7 +156,7 @@ class GroupMaterialTests(TestCase): ) SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev) - url = urlreverse('material_edit', kwargs=dict(name=doc.name, action="revise")) + url = urlreverse('ietf.doc.views_material.edit_material', kwargs=dict(name=doc.name, action="revise")) login_testing_unauthorized(self, "secretary", url) content = "some text" diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py index 8566c393b..6233b52cb 100644 --- a/ietf/doc/tests_status_change.py +++ b/ietf/doc/tests_status_change.py @@ -24,7 +24,7 @@ from ietf.utils.test_utils import login_testing_unauthorized class StatusChangeTests(TestCase): def test_start_review(self): - url = urlreverse('start_rfc_status_change') + url = urlreverse('ietf.doc.views_status_change.start_rfc_status_change') login_testing_unauthorized(self, "secretary", url) # normal get should succeed and get a reasonable form @@ -126,7 +126,7 @@ class StatusChangeTests(TestCase): def test_edit_notices(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') - url = urlreverse('status_change_notices',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_doc.edit_notify;status-change',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -161,7 +161,7 @@ class StatusChangeTests(TestCase): def test_edit_title(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') - url = urlreverse('status_change_title',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_status_change.edit_title',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -180,7 +180,7 @@ class StatusChangeTests(TestCase): def test_edit_ad(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') - url = urlreverse('status_change_ad',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_status_change.edit_ad',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -200,7 +200,7 @@ class StatusChangeTests(TestCase): def test_edit_telechat_date(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') - url = urlreverse('status_change_telechat_date',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_doc.telechat_date;status-change',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -245,7 +245,7 @@ class StatusChangeTests(TestCase): def test_edit_lc(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') - url = urlreverse('status_change_last_call',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_status_change.last_call',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) @@ -289,7 +289,7 @@ class StatusChangeTests(TestCase): def test_approve(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') - url = urlreverse('status_change_approve',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_status_change.approve',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "secretary", url) @@ -331,7 +331,7 @@ class StatusChangeTests(TestCase): def test_edit_relations(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') - url = urlreverse('status_change_relations',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_status_change.edit_relations',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "secretary", url) @@ -395,7 +395,7 @@ class StatusChangeTests(TestCase): class StatusChangeSubmitTests(TestCase): def test_initial_submission(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') - url = urlreverse('status_change_submit',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_status_change.submit',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) # normal get @@ -421,7 +421,7 @@ class StatusChangeSubmitTests(TestCase): def test_subsequent_submission(self): doc = Document.objects.get(name='status-change-imaginary-mid-review') - url = urlreverse('status_change_submit',kwargs=dict(name=doc.name)) + url = urlreverse('ietf.doc.views_status_change.submit',kwargs=dict(name=doc.name)) login_testing_unauthorized(self, "ad", url) # A little additional setup diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py index 765131d48..69fa7ad55 100644 --- a/ietf/doc/urls.py +++ b/ietf/doc/urls.py @@ -45,14 +45,14 @@ session_patterns = [ urlpatterns = [ url(r'^$', views_search.search), - url(r'^(?P[A-Za-z0-9\._\+\-]+)$', views_search.search_for_name, name="doc_search_for_name"), - url(r'^search/$', views_search.search, name="doc_search"), - url(r'^in-last-call/$', views_search.drafts_in_last_call, name="drafts_in_last_call"), - url(r'^ad/(?P[\w.-]+)/$(?u)', views_search.docs_for_ad, name="docs_for_ad"), + url(r'^(?P[A-Za-z0-9\._\+\-]+)$', views_search.search_for_name), + url(r'^search/$', views_search.search), + url(r'^in-last-call/$', views_search.drafts_in_last_call), + url(r'^ad/(?P[\w.-]+)/$(?u)', views_search.docs_for_ad), url(r'^ad2/(?P[\w.-]+)/$(?u)', RedirectView.as_view(url='/doc/ad/%(name)s/', permanent=True)), - url(r'^rfc-status-changes/$', views_status_change.rfc_status_changes, name='ietf.doc.views_status_change.rfc_status_changes'), - url(r'^start-rfc-status-change/(?:%(name)s/)?$' % settings.URL_REGEXPS, views_status_change.start_rfc_status_change, name='start_rfc_status_change'), - url(r'^iesg/(?P[A-Za-z0-9.-]+/)?$', views_search.drafts_in_iesg_process, name="drafts_in_iesg_process"), + url(r'^rfc-status-changes/$', views_status_change.rfc_status_changes), + url(r'^start-rfc-status-change/(?:%(name)s/)?$' % settings.URL_REGEXPS, views_status_change.start_rfc_status_change), + url(r'^iesg/(?P[A-Za-z0-9.-]+/)?$', views_search.drafts_in_iesg_process), url(r'^email-aliases/$', views_doc.email_aliases), url(r'^stats/newrevisiondocevent/?$', views_stats.chart_newrevisiondocevent), url(r'^stats/newrevisiondocevent/conf/?$', views_stats.chart_conf_newrevisiondocevent), @@ -60,66 +60,66 @@ urlpatterns = [ url(r'^stats/person/(?P[0-9]+)/drafts/conf/?$', views_stats.chart_conf_person_drafts), url(r'^stats/person/(?P[0-9]+)/drafts/data/?$', views_stats.chart_data_person_drafts), - url(r'^all/$', views_search.index_all_drafts, name="index_all_drafts"), - url(r'^active/$', views_search.index_active_drafts, name="index_active_drafts"), - url(r'^select2search/(?P(document|docalias))/(?Pdraft)/$', views_search.ajax_select2_search_docs, name="ajax_select2_search_docs"), + url(r'^all/$', views_search.index_all_drafts), + url(r'^active/$', views_search.index_active_drafts), + url(r'^select2search/(?P(document|docalias))/(?Pdraft)/$', views_search.ajax_select2_search_docs), url(r'^%(name)s/(?:%(rev)s/)?$' % settings.URL_REGEXPS, views_doc.document_main), url(r'^%(name)s/(?:%(rev)s/)?bibtex/$' % settings.URL_REGEXPS, views_doc.document_bibtex), - url(r'^%(name)s/history/$' % settings.URL_REGEXPS, views_doc.document_history, name="doc_history"), - url(r'^%(name)s/writeup/$' % settings.URL_REGEXPS, views_doc.document_writeup, name="doc_writeup"), - url(r'^%(name)s/email/$' % settings.URL_REGEXPS, views_doc.document_email, name="ietf.doc.views_doc.document_email"), - url(r'^%(name)s/shepherdwriteup/$' % settings.URL_REGEXPS, views_doc.document_shepherd_writeup, name="doc_shepherd_writeup"), - url(r'^%(name)s/references/$' % settings.URL_REGEXPS, views_doc.document_references, name="doc_references"), - url(r'^%(name)s/referencedby/$' % settings.URL_REGEXPS, views_doc.document_referenced_by, name="doc_referenced_by"), + url(r'^%(name)s/history/$' % settings.URL_REGEXPS, views_doc.document_history), + url(r'^%(name)s/writeup/$' % settings.URL_REGEXPS, views_doc.document_writeup), + url(r'^%(name)s/email/$' % settings.URL_REGEXPS, views_doc.document_email), + url(r'^%(name)s/shepherdwriteup/$' % settings.URL_REGEXPS, views_doc.document_shepherd_writeup), + url(r'^%(name)s/references/$' % settings.URL_REGEXPS, views_doc.document_references), + url(r'^%(name)s/referencedby/$' % settings.URL_REGEXPS, views_doc.document_referenced_by), url(r'^%(name)s/ballot/$' % settings.URL_REGEXPS, views_doc.document_ballot), url(r'^%(name)s/ballot/(?P[0-9]+)/$' % settings.URL_REGEXPS, views_doc.document_ballot), url(r'^%(name)s/ballot/(?P[0-9]+)/position/$' % settings.URL_REGEXPS, views_ballot.edit_position), - url(r'^%(name)s/ballot/(?P[0-9]+)/emailposition/$' % settings.URL_REGEXPS, views_ballot.send_ballot_comment, name='doc_send_ballot_comment'), + url(r'^%(name)s/ballot/(?P[0-9]+)/emailposition/$' % settings.URL_REGEXPS, views_ballot.send_ballot_comment), url(r'^%(name)s/(?:%(rev)s/)?doc.json$' % settings.URL_REGEXPS, views_doc.document_json), url(r'^%(name)s/ballotpopup/(?P[0-9]+)/$' % settings.URL_REGEXPS, views_doc.ballot_popup), url(r'^(?P[A-Za-z0-9._+-]+)/reviewrequest/', include("ietf.doc.urls_review")), - url(r'^%(name)s/email-aliases/$' % settings.URL_REGEXPS, RedirectView.as_view(pattern_name='ietf.doc.views_doc.document_email', permanent=False),name='doc_specific_email_aliases'), + url(r'^%(name)s/email-aliases/$' % settings.URL_REGEXPS, RedirectView.as_view(pattern_name='ietf.doc.views_doc.document_email', permanent=False),name='ietf.doc.urls.redirect.document_email'), - url(r'^%(name)s/edit/state/$' % settings.URL_REGEXPS, views_draft.change_state, name='doc_change_state'), # IESG state - url(r'^%(name)s/edit/state/(?Piana-action|iana-review)/$' % settings.URL_REGEXPS, views_draft.change_iana_state, name='doc_change_iana_state'), - url(r'^%(name)s/edit/info/$' % settings.URL_REGEXPS, views_draft.edit_info, name='doc_edit_info'), - url(r'^%(name)s/edit/requestresurrect/$' % settings.URL_REGEXPS, views_draft.request_resurrect, name='doc_request_resurrect'), - url(r'^%(name)s/edit/submit-to-iesg/$' % settings.URL_REGEXPS, views_draft.to_iesg, name='doc_to_iesg'), - url(r'^%(name)s/edit/resurrect/$' % settings.URL_REGEXPS, views_draft.resurrect, name='doc_resurrect'), - url(r'^%(name)s/edit/addcomment/$' % settings.URL_REGEXPS, views_doc.add_comment, name='doc_add_comment'), - url(r'^ajax/internet_draft/?$', views_draft.doc_ajax_internet_draft, name="doc_ajax_internet_draft"), + url(r'^%(name)s/edit/state/$' % settings.URL_REGEXPS, views_draft.change_state), # IESG state + url(r'^%(name)s/edit/state/(?Piana-action|iana-review)/$' % settings.URL_REGEXPS, views_draft.change_iana_state), + url(r'^%(name)s/edit/info/$' % settings.URL_REGEXPS, views_draft.edit_info), + url(r'^%(name)s/edit/requestresurrect/$' % settings.URL_REGEXPS, views_draft.request_resurrect), + url(r'^%(name)s/edit/submit-to-iesg/$' % settings.URL_REGEXPS, views_draft.to_iesg), + url(r'^%(name)s/edit/resurrect/$' % settings.URL_REGEXPS, views_draft.resurrect), + url(r'^%(name)s/edit/addcomment/$' % settings.URL_REGEXPS, views_doc.add_comment), + url(r'^ajax/internet_draft/?$', views_draft.doc_ajax_internet_draft), - url(r'^%(name)s/edit/stream/$' % settings.URL_REGEXPS, views_draft.change_stream, name='doc_change_stream'), - url(r'^%(name)s/edit/replaces/$' % settings.URL_REGEXPS, views_draft.replaces, name='doc_change_replaces'), - url(r'^%(name)s/edit/notify/$' % settings.URL_REGEXPS, views_doc.edit_notify, name='doc_change_notify'), - url(r'^%(name)s/edit/suggested-replaces/$' % settings.URL_REGEXPS, views_draft.review_possibly_replaces, name='doc_review_possibly_replaces'), - url(r'^%(name)s/edit/status/$' % settings.URL_REGEXPS, views_draft.change_intention, name='doc_change_intended_status'), - url(r'^%(name)s/edit/telechat/$' % settings.URL_REGEXPS, views_doc.telechat_date, name='doc_change_telechat_date'), - url(r'^%(name)s/edit/iesgnote/$' % settings.URL_REGEXPS, views_draft.edit_iesg_note, name='doc_change_iesg_note'), - url(r'^%(name)s/edit/ad/$' % settings.URL_REGEXPS, views_draft.edit_ad, name='doc_change_ad'), - url(r'^%(name)s/edit/consensus/$' % settings.URL_REGEXPS, views_draft.edit_consensus, name='doc_edit_consensus'), - url(r'^%(name)s/edit/shepherd/$' % settings.URL_REGEXPS, views_draft.edit_shepherd, name='doc_edit_shepherd'), - url(r'^%(name)s/edit/shepherdemail/$' % settings.URL_REGEXPS, views_draft.change_shepherd_email, name='doc_change_shepherd_email'), - url(r'^%(name)s/edit/shepherdwriteup/$' % settings.URL_REGEXPS, views_draft.edit_shepherd_writeup, name='doc_edit_shepherd_writeup'), - url(r'^%(name)s/edit/requestpublication/$' % settings.URL_REGEXPS, views_draft.request_publication, name='doc_request_publication'), - url(r'^%(name)s/edit/adopt/$' % settings.URL_REGEXPS, views_draft.adopt_draft, name='doc_adopt_draft'), - url(r'^%(name)s/edit/state/(?Pdraft-stream-[a-z]+)/$' % settings.URL_REGEXPS, views_draft.change_stream_state, name='doc_change_stream_state'), + url(r'^%(name)s/edit/stream/$' % settings.URL_REGEXPS, views_draft.change_stream), + url(r'^%(name)s/edit/replaces/$' % settings.URL_REGEXPS, views_draft.replaces), + url(r'^%(name)s/edit/notify/$' % settings.URL_REGEXPS, views_doc.edit_notify), + url(r'^%(name)s/edit/suggested-replaces/$' % settings.URL_REGEXPS, views_draft.review_possibly_replaces), + url(r'^%(name)s/edit/status/$' % settings.URL_REGEXPS, views_draft.change_intention), + url(r'^%(name)s/edit/telechat/$' % settings.URL_REGEXPS, views_doc.telechat_date), + url(r'^%(name)s/edit/iesgnote/$' % settings.URL_REGEXPS, views_draft.edit_iesg_note), + url(r'^%(name)s/edit/ad/$' % settings.URL_REGEXPS, views_draft.edit_ad), + url(r'^%(name)s/edit/consensus/$' % settings.URL_REGEXPS, views_draft.edit_consensus), + url(r'^%(name)s/edit/shepherd/$' % settings.URL_REGEXPS, views_draft.edit_shepherd), + url(r'^%(name)s/edit/shepherdemail/$' % settings.URL_REGEXPS, views_draft.change_shepherd_email), + url(r'^%(name)s/edit/shepherdwriteup/$' % settings.URL_REGEXPS, views_draft.edit_shepherd_writeup), + url(r'^%(name)s/edit/requestpublication/$' % settings.URL_REGEXPS, views_draft.request_publication), + url(r'^%(name)s/edit/adopt/$' % settings.URL_REGEXPS, views_draft.adopt_draft), + url(r'^%(name)s/edit/state/(?Pdraft-stream-[a-z]+)/$' % settings.URL_REGEXPS, views_draft.change_stream_state), - url(r'^%(name)s/edit/clearballot/$' % settings.URL_REGEXPS, views_ballot.clear_ballot, name='doc_clear_ballot'), - url(r'^%(name)s/edit/deferballot/$' % settings.URL_REGEXPS, views_ballot.defer_ballot, name='doc_defer_ballot'), - url(r'^%(name)s/edit/undeferballot/$' % settings.URL_REGEXPS, views_ballot.undefer_ballot, name='doc_undefer_ballot'), - url(r'^%(name)s/edit/lastcalltext/$' % settings.URL_REGEXPS, views_ballot.lastcalltext, name='doc_ballot_lastcall'), - url(r'^%(name)s/edit/ballotwriteupnotes/$' % settings.URL_REGEXPS, views_ballot.ballot_writeupnotes, name='doc_ballot_writeupnotes'), - url(r'^%(name)s/edit/ballotrfceditornote/$' % settings.URL_REGEXPS, views_ballot.ballot_rfceditornote, name='doc_ballot_rfceditornote'), - url(r'^%(name)s/edit/approvaltext/$' % settings.URL_REGEXPS, views_ballot.ballot_approvaltext, name='doc_ballot_approvaltext'), - url(r'^%(name)s/edit/approveballot/$' % settings.URL_REGEXPS, views_ballot.approve_ballot, name='doc_approve_ballot'), - url(r'^%(name)s/edit/makelastcall/$' % settings.URL_REGEXPS, views_ballot.make_last_call, name='doc_make_last_call'), + url(r'^%(name)s/edit/clearballot/$' % settings.URL_REGEXPS, views_ballot.clear_ballot), + url(r'^%(name)s/edit/deferballot/$' % settings.URL_REGEXPS, views_ballot.defer_ballot), + url(r'^%(name)s/edit/undeferballot/$' % settings.URL_REGEXPS, views_ballot.undefer_ballot), + url(r'^%(name)s/edit/lastcalltext/$' % settings.URL_REGEXPS, views_ballot.lastcalltext), + url(r'^%(name)s/edit/ballotwriteupnotes/$' % settings.URL_REGEXPS, views_ballot.ballot_writeupnotes), + url(r'^%(name)s/edit/ballotrfceditornote/$' % settings.URL_REGEXPS, views_ballot.ballot_rfceditornote), + url(r'^%(name)s/edit/approvaltext/$' % settings.URL_REGEXPS, views_ballot.ballot_approvaltext), + url(r'^%(name)s/edit/approveballot/$' % settings.URL_REGEXPS, views_ballot.approve_ballot), + url(r'^%(name)s/edit/makelastcall/$' % settings.URL_REGEXPS, views_ballot.make_last_call), - url(r'^help/state/(?P[\w-]+)/$', views_help.state_help, name="state_help"), - url(r'^help/relationships/$', views_help.relationship_help, name="relationship_help"), - url(r'^help/relationships/(?P\w+)/$', views_help.relationship_help, name="relationship_subset_help"), + url(r'^help/state/(?P[\w-]+)/$', views_help.state_help), + url(r'^help/relationships/$', views_help.relationship_help), + url(r'^help/relationships/(?P\w+)/$', views_help.relationship_help), url(r'^%(name)s/meetings/?$' % settings.URL_REGEXPS, views_doc.all_presentations), diff --git a/ietf/doc/urls_charter.py b/ietf/doc/urls_charter.py index 51e95718a..5daf4092d 100644 --- a/ietf/doc/urls_charter.py +++ b/ietf/doc/urls_charter.py @@ -6,16 +6,16 @@ from ietf.doc import views_charter, views_doc from ietf.utils.urls import url urlpatterns = [ - url(r'^state/$', views_charter.change_state, name='charter_change_state'), - url(r'^title/$', views_charter.change_title, name='charter_change_title'), - url(r'^(?P