From 157d362fe5bbb1ea15c8f47663c0929702f942a4 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 21 Jul 2015 11:55:31 +0100 Subject: [PATCH 1/3] Move wagtailadmin.urls into a subfolder --- wagtail/wagtailadmin/{urls.py => urls/__init__.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename wagtail/wagtailadmin/{urls.py => urls/__init__.py} (100%) diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls/__init__.py similarity index 100% rename from wagtail/wagtailadmin/urls.py rename to wagtail/wagtailadmin/urls/__init__.py From 6a9ee7dfe6d59de67e4fcea007ddfc3ea693d9e1 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 21 Jul 2015 11:59:35 +0100 Subject: [PATCH 2/3] Move wagtailadmin /pages URLs into a submodule --- wagtail/wagtailadmin/urls/__init__.py | 38 +++----------------------- wagtail/wagtailadmin/urls/pages.py | 39 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 35 deletions(-) create mode 100644 wagtail/wagtailadmin/urls/pages.py diff --git a/wagtail/wagtailadmin/urls/__init__.py b/wagtail/wagtailadmin/urls/__init__.py index 8618a94a3..778e1418e 100644 --- a/wagtail/wagtailadmin/urls/__init__.py +++ b/wagtail/wagtailadmin/urls/__init__.py @@ -4,7 +4,8 @@ from django.contrib.auth import views as django_auth_views from django.views.decorators.cache import cache_control from wagtail.wagtailadmin.forms import PasswordResetForm -from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar, page_privacy +from wagtail.wagtailadmin.urls import pages as wagtailadmin_pages_urls +from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar from wagtail.wagtailcore import hooks from wagtail.utils.urlpatterns import decorate_urlpatterns @@ -20,40 +21,7 @@ urlpatterns = [ url(r'^pages/$', pages.index, name='wagtailadmin_explore_root'), url(r'^pages/(\d+)/$', pages.index, name='wagtailadmin_explore'), - url(r'^pages/', include([ - url(r'^add/(\w+)/(\w+)/(\d+)/$', pages.create, name='add'), - url(r'^add/(\w+)/(\w+)/(\d+)/preview/$', pages.preview_on_create, name='preview_on_add'), - url(r'^usage/(\w+)/(\w+)/$', pages.content_type_use, name='type_use'), - - url(r'^(\d+)/edit/$', pages.edit, name='edit'), - url(r'^(\d+)/edit/preview/$', pages.preview_on_edit, name='preview_on_edit'), - - url(r'^preview/$', pages.preview, name='preview'), - url(r'^preview_loading/$', pages.preview_loading, name='preview_loading'), - - url(r'^(\d+)/view_draft/$', pages.view_draft, name='view_draft'), - url(r'^(\d+)/add_subpage/$', pages.add_subpage, name='add_subpage'), - url(r'^(\d+)/delete/$', pages.delete, name='delete'), - url(r'^(\d+)/unpublish/$', pages.unpublish, name='unpublish'), - - url(r'^search/$', pages.search, name='search'), - - url(r'^(\d+)/move/$', pages.move_choose_destination, name='move'), - url(r'^(\d+)/move/(\d+)/$', pages.move_choose_destination, name='move_choose_destination'), - url(r'^(\d+)/move/(\d+)/confirm/$', pages.move_confirm, name='move_confirm'), - url(r'^(\d+)/set_position/$', pages.set_page_position, name='set_page_position'), - - url(r'^(\d+)/copy/$', pages.copy, name='copy'), - - url(r'^moderation/(\d+)/approve/$', pages.approve_moderation, name='approve_moderation'), - url(r'^moderation/(\d+)/reject/$', pages.reject_moderation, name='reject_moderation'), - url(r'^moderation/(\d+)/preview/$', pages.preview_for_moderation, name='preview_for_moderation'), - - url(r'^(\d+)/privacy/$', page_privacy.set_privacy, name='set_privacy'), - - url(r'^(\d+)/lock/$', pages.lock, name='lock'), - url(r'^(\d+)/unlock/$', pages.unlock, name='unlock'), - ], namespace='wagtailadmin_pages')), + url(r'^pages/', include(wagtailadmin_pages_urls, namespace='wagtailadmin_pages')), # TODO: Move into wagtailadmin_pages namespace url(r'^choose-page/$', chooser.browse, name='wagtailadmin_choose_page'), diff --git a/wagtail/wagtailadmin/urls/pages.py b/wagtail/wagtailadmin/urls/pages.py new file mode 100644 index 000000000..660dbaed0 --- /dev/null +++ b/wagtail/wagtailadmin/urls/pages.py @@ -0,0 +1,39 @@ +from django.conf.urls import url + +from wagtail.wagtailadmin.views import pages, page_privacy + + +urlpatterns = [ + url(r'^add/(\w+)/(\w+)/(\d+)/$', pages.create, name='add'), + url(r'^add/(\w+)/(\w+)/(\d+)/preview/$', pages.preview_on_create, name='preview_on_add'), + url(r'^usage/(\w+)/(\w+)/$', pages.content_type_use, name='type_use'), + + url(r'^(\d+)/edit/$', pages.edit, name='edit'), + url(r'^(\d+)/edit/preview/$', pages.preview_on_edit, name='preview_on_edit'), + + url(r'^preview/$', pages.preview, name='preview'), + url(r'^preview_loading/$', pages.preview_loading, name='preview_loading'), + + url(r'^(\d+)/view_draft/$', pages.view_draft, name='view_draft'), + url(r'^(\d+)/add_subpage/$', pages.add_subpage, name='add_subpage'), + url(r'^(\d+)/delete/$', pages.delete, name='delete'), + url(r'^(\d+)/unpublish/$', pages.unpublish, name='unpublish'), + + url(r'^search/$', pages.search, name='search'), + + url(r'^(\d+)/move/$', pages.move_choose_destination, name='move'), + url(r'^(\d+)/move/(\d+)/$', pages.move_choose_destination, name='move_choose_destination'), + url(r'^(\d+)/move/(\d+)/confirm/$', pages.move_confirm, name='move_confirm'), + url(r'^(\d+)/set_position/$', pages.set_page_position, name='set_page_position'), + + url(r'^(\d+)/copy/$', pages.copy, name='copy'), + + url(r'^moderation/(\d+)/approve/$', pages.approve_moderation, name='approve_moderation'), + url(r'^moderation/(\d+)/reject/$', pages.reject_moderation, name='reject_moderation'), + url(r'^moderation/(\d+)/preview/$', pages.preview_for_moderation, name='preview_for_moderation'), + + url(r'^(\d+)/privacy/$', page_privacy.set_privacy, name='set_privacy'), + + url(r'^(\d+)/lock/$', pages.lock, name='lock'), + url(r'^(\d+)/unlock/$', pages.unlock, name='unlock'), +] From 07c1779a7caca8969a36c9c1a44d4ff78bd8e6f8 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 20 Jul 2015 18:28:07 +0100 Subject: [PATCH 3/3] Move wagtailadmin /password_reset URLs into a submodule --- wagtail/wagtailadmin/urls/__init__.py | 30 ++---------------- wagtail/wagtailadmin/urls/password_reset.py | 34 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 28 deletions(-) create mode 100644 wagtail/wagtailadmin/urls/password_reset.py diff --git a/wagtail/wagtailadmin/urls/__init__.py b/wagtail/wagtailadmin/urls/__init__.py index 778e1418e..01fea763b 100644 --- a/wagtail/wagtailadmin/urls/__init__.py +++ b/wagtail/wagtailadmin/urls/__init__.py @@ -1,10 +1,9 @@ from django.conf.urls import url, include from django.contrib.auth.decorators import permission_required -from django.contrib.auth import views as django_auth_views from django.views.decorators.cache import cache_control -from wagtail.wagtailadmin.forms import PasswordResetForm from wagtail.wagtailadmin.urls import pages as wagtailadmin_pages_urls +from wagtail.wagtailadmin.urls import password_reset as wagtailadmin_password_reset_urls from wagtail.wagtailadmin.views import account, chooser, home, pages, tags, userbar from wagtail.wagtailcore import hooks from wagtail.utils.urlpatterns import decorate_urlpatterns @@ -65,32 +64,7 @@ urlpatterns += [ url(r'^userbar/moderation/(\d+)/$', userbar.for_moderation, name='wagtailadmin_userbar_moderation'), # Password reset - url( - r'^password_reset/$', django_auth_views.password_reset, { - 'template_name': 'wagtailadmin/account/password_reset/form.html', - 'email_template_name': 'wagtailadmin/account/password_reset/email.txt', - 'subject_template_name': 'wagtailadmin/account/password_reset/email_subject.txt', - 'password_reset_form': PasswordResetForm, - 'post_reset_redirect': 'wagtailadmin_password_reset_done', - }, name='wagtailadmin_password_reset' - ), - url( - r'^password_reset/done/$', django_auth_views.password_reset_done, { - 'template_name': 'wagtailadmin/account/password_reset/done.html' - }, name='wagtailadmin_password_reset_done' - ), - url( - r'^password_reset/confirm/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', - django_auth_views.password_reset_confirm, { - 'template_name': 'wagtailadmin/account/password_reset/confirm.html', - 'post_reset_redirect': 'wagtailadmin_password_reset_complete', - }, name='wagtailadmin_password_reset_confirm', - ), - url( - r'^password_reset/complete/$', django_auth_views.password_reset_complete, { - 'template_name': 'wagtailadmin/account/password_reset/complete.html' - }, name='wagtailadmin_password_reset_complete' - ), + url(r'^password_reset/', include(wagtailadmin_password_reset_urls)), ] # Decorate all views with cache settings to prevent caching diff --git a/wagtail/wagtailadmin/urls/password_reset.py b/wagtail/wagtailadmin/urls/password_reset.py new file mode 100644 index 000000000..5ae9e55dc --- /dev/null +++ b/wagtail/wagtailadmin/urls/password_reset.py @@ -0,0 +1,34 @@ +from django.conf.urls import url +from django.contrib.auth import views as django_auth_views + +from wagtail.wagtailadmin.forms import PasswordResetForm + + +urlpatterns = [ + url( + r'^$', django_auth_views.password_reset, { + 'template_name': 'wagtailadmin/account/password_reset/form.html', + 'email_template_name': 'wagtailadmin/account/password_reset/email.txt', + 'subject_template_name': 'wagtailadmin/account/password_reset/email_subject.txt', + 'password_reset_form': PasswordResetForm, + 'post_reset_redirect': 'wagtailadmin_password_reset_done', + }, name='wagtailadmin_password_reset' + ), + url( + r'^done/$', django_auth_views.password_reset_done, { + 'template_name': 'wagtailadmin/account/password_reset/done.html' + }, name='wagtailadmin_password_reset_done' + ), + url( + r'^confirm/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', + django_auth_views.password_reset_confirm, { + 'template_name': 'wagtailadmin/account/password_reset/confirm.html', + 'post_reset_redirect': 'wagtailadmin_password_reset_complete', + }, name='wagtailadmin_password_reset_confirm', + ), + url( + r'^complete/$', django_auth_views.password_reset_complete, { + 'template_name': 'wagtailadmin/account/password_reset/complete.html' + }, name='wagtailadmin_password_reset_complete' + ), +]