From cb102ed115f4eece79ea999a7f00d03dde6e11cd Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 15 Apr 2019 01:26:40 -0400 Subject: [PATCH] Add keyword arguments to URL definitions Signed-off-by: Roberto Rosario --- HISTORY.rst | 1 + docs/releases/3.2.rst | 2 + mayan/apps/acls/urls.py | 33 ++-- mayan/apps/authentication/urls.py | 18 +- mayan/apps/cabinets/urls.py | 62 +++--- mayan/apps/checkouts/urls.py | 15 +- mayan/apps/common/apps.py | 4 +- mayan/apps/common/urls.py | 50 ++--- mayan/apps/converter/urls.py | 12 +- mayan/apps/django_gpg/urls.py | 26 +-- mayan/apps/document_comments/urls.py | 20 +- mayan/apps/document_indexing/urls.py | 74 ++++---- mayan/apps/document_parsing/urls.py | 41 ++-- mayan/apps/document_signatures/urls.py | 32 ++-- mayan/apps/document_states/urls.py | 175 ++++++++--------- mayan/apps/documents/urls.py | 252 +++++++++++++------------ mayan/apps/dynamic_search/urls.py | 27 +-- mayan/apps/events/urls.py | 51 ++--- mayan/apps/linking/urls.py | 68 +++---- mayan/apps/mailer/urls.py | 36 ++-- mayan/apps/mayan_statistics/urls.py | 10 +- mayan/apps/metadata/urls.py | 59 +++--- mayan/apps/motd/urls.py | 19 +- mayan/apps/ocr/urls.py | 48 ++--- mayan/apps/permissions/urls.py | 38 ++-- mayan/apps/rest_api/urls.py | 6 +- mayan/apps/smart_settings/urls.py | 10 +- mayan/apps/sources/urls.py | 66 ++++--- mayan/apps/tags/urls.py | 61 +++--- mayan/apps/task_manager/urls.py | 16 +- mayan/apps/user_management/urls.py | 64 ++++--- mayan/urls/base.py | 2 +- mayan/urls/development.py | 4 +- 33 files changed, 754 insertions(+), 648 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 5e60753cee..12d545986d 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -58,6 +58,7 @@ * Add FilteredSelectionForm class. * Use FilteredSelectionForm for TagMultipleSelectionForm. * Use FilteredSelectionForm for the class CabinetListForm. +* Add keyword arguments to URL definitions. 3.1.11 (2019-04-XX) =================== diff --git a/docs/releases/3.2.rst b/docs/releases/3.2.rst index 0375214c00..b05132feaa 100644 --- a/docs/releases/3.2.rst +++ b/docs/releases/3.2.rst @@ -82,6 +82,8 @@ Other changes * Add FilteredSelectionForm class. * Use FilteredSelectionForm for TagMultipleSelectionForm. * Use FilteredSelectionForm for the class CabinetListForm. +* Add keyword arguments to URL definitions. + Removals -------- diff --git a/mayan/apps/acls/urls.py b/mayan/apps/acls/urls.py index ea0adb9d8b..a1f2ee7cbd 100644 --- a/mayan/apps/acls/urls.py +++ b/mayan/apps/acls/urls.py @@ -12,35 +12,40 @@ from .views import ( urlpatterns = [ url( - r'^(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/create/$', - ACLCreateView.as_view(), name='acl_create' + regex=r'^(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/create/$', + view=ACLCreateView.as_view(), name='acl_create' ), url( - r'^(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/list/$', - ACLListView.as_view(), name='acl_list' + regex=r'^(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/list/$', + view=ACLListView.as_view(), name='acl_list' ), - url(r'^(?P\d+)/delete/$', ACLDeleteView.as_view(), name='acl_delete'), url( - r'^(?P\d+)/permissions/$', ACLPermissionsView.as_view(), + regex=r'^(?P\d+)/delete/$', view=ACLDeleteView.as_view(), + name='acl_delete' + ), + url( + regex=r'^(?P\d+)/permissions/$', view=ACLPermissionsView.as_view(), name='acl_permissions' ), ] api_urls = [ url( - r'^objects/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/acls/$', - APIObjectACLListView.as_view(), name='accesscontrollist-list' + regex=r'^objects/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/acls/$', + view=APIObjectACLListView.as_view(), name='accesscontrollist-list' ), url( - r'^objects/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/acls/(?P\d+)/$', - APIObjectACLView.as_view(), name='accesscontrollist-detail' + regex=r'^objects/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/acls/(?P\d+)/$', + view=APIObjectACLView.as_view(), name='accesscontrollist-detail' ), url( - r'^objects/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/acls/(?P\d+)/permissions/$', - APIObjectACLPermissionListView.as_view(), name='accesscontrollist-permission-list' + regex=r'^objects/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/acls/(?P\d+)/permissions/$', + view=APIObjectACLPermissionListView.as_view(), + name='accesscontrollist-permission-list' ), url( - r'^objects/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/acls/(?P\d+)/permissions/(?P\d+)/$', - APIObjectACLPermissionView.as_view(), name='accesscontrollist-permission-detail' + regex=r'^objects/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/acls/(?P\d+)/permissions/(?P\d+)/$', + view=APIObjectACLPermissionView.as_view(), + name='accesscontrollist-permission-detail' ), ] diff --git a/mayan/apps/authentication/urls.py b/mayan/apps/authentication/urls.py index 93443bea2d..fc2faa5bf1 100644 --- a/mayan/apps/authentication/urls.py +++ b/mayan/apps/authentication/urls.py @@ -12,32 +12,32 @@ from .views import ( urlpatterns = [ - url(r'^login/$', login_view, name='login_view'), + url(regex=r'^login/$', view=login_view, name='login_view'), url( - r'^password/change/done/$', password_change_done, + regex=r'^password/change/done/$', view=password_change_done, name='password_change_done' ), url( - r'^password/change/$', password_change_view, + regex=r'^password/change/$', view=password_change_view, name='password_change_view' ), url( - r'^logout/$', logout, {'next_page': settings.LOGIN_REDIRECT_URL}, + regex=r'^logout/$', view=logout, kwargs={'next_page': settings.LOGIN_REDIRECT_URL}, name='logout_view' ), url( - r'^password/reset/$', password_reset_view, name='password_reset_view' + regex=r'^password/reset/$', view=password_reset_view, name='password_reset_view' ), url( - r'^password/reset/confirm/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', - password_reset_confirm_view, name='password_reset_confirm_view' + regex=r'^password/reset/confirm/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', + view=password_reset_confirm_view, name='password_reset_confirm_view' ), url( - r'^password/reset/complete/$', password_reset_complete_view, + regex=r'^password/reset/complete/$', view=password_reset_complete_view, name='password_reset_complete_view' ), url( - r'^password/reset/done/$', password_reset_done_view, + regex=r'^password/reset/done/$', view=password_reset_done_view, name='password_reset_done_view' ), ] diff --git a/mayan/apps/cabinets/urls.py b/mayan/apps/cabinets/urls.py index 14142d67b1..9afcb64caa 100644 --- a/mayan/apps/cabinets/urls.py +++ b/mayan/apps/cabinets/urls.py @@ -13,61 +13,73 @@ from .views import ( ) urlpatterns = [ - url(r'^list/$', CabinetListView.as_view(), name='cabinet_list'), url( - r'^(?P\d+)/child/add/$', CabinetChildAddView.as_view(), + regex=r'^list/$', view=CabinetListView.as_view(), name='cabinet_list' + ), + url( + regex=r'^(?P\d+)/child/add/$', view=CabinetChildAddView.as_view(), name='cabinet_child_add' ), - url(r'^create/$', CabinetCreateView.as_view(), name='cabinet_create'), url( - r'^(?P\d+)/edit/$', CabinetEditView.as_view(), name='cabinet_edit' + regex=r'^create/$', view=CabinetCreateView.as_view(), + name='cabinet_create' ), url( - r'^(?P\d+)/delete/$', CabinetDeleteView.as_view(), + regex=r'^(?P\d+)/edit/$', view=CabinetEditView.as_view(), + name='cabinet_edit' + ), + url( + regex=r'^(?P\d+)/delete/$', view=CabinetDeleteView.as_view(), name='cabinet_delete' ), - url(r'^(?P\d+)/$', CabinetDetailView.as_view(), name='cabinet_view'), - url( - r'^document/(?P\d+)/cabinet/add/$', - DocumentAddToCabinetView.as_view(), name='cabinet_add_document' + regex=r'^(?P\d+)/$', view=CabinetDetailView.as_view(), + name='cabinet_view' ), url( - r'^document/multiple/cabinet/add/$', - DocumentAddToCabinetView.as_view(), + regex=r'^document/(?P\d+)/cabinet/add/$', + view=DocumentAddToCabinetView.as_view(), name='cabinet_add_document' + ), + url( + regex=r'^document/multiple/cabinet/add/$', + view=DocumentAddToCabinetView.as_view(), name='cabinet_add_multiple_documents' ), url( - r'^document/(?P\d+)/cabinet/remove/$', - DocumentRemoveFromCabinetView.as_view(), name='document_cabinet_remove' + regex=r'^document/(?P\d+)/cabinet/remove/$', + view=DocumentRemoveFromCabinetView.as_view(), + name='document_cabinet_remove' ), url( - r'^document/multiple/cabinet/remove/$', - DocumentRemoveFromCabinetView.as_view(), + regex=r'^document/multiple/cabinet/remove/$', + view=DocumentRemoveFromCabinetView.as_view(), name='multiple_document_cabinet_remove' ), url( - r'^document/(?P\d+)/cabinet/list/$', - DocumentCabinetListView.as_view(), name='document_cabinet_list' + regex=r'^document/(?P\d+)/cabinet/list/$', + view=DocumentCabinetListView.as_view(), name='document_cabinet_list' ), ] api_urls = [ url( - r'^cabinets/(?P[0-9]+)/documents/(?P[0-9]+)/$', - APICabinetDocumentView.as_view(), name='cabinet-document' + regex=r'^cabinets/(?P[0-9]+)/documents/(?P[0-9]+)/$', + view=APICabinetDocumentView.as_view(), name='cabinet-document' ), url( - r'^cabinets/(?P[0-9]+)/documents/$', - APICabinetDocumentListView.as_view(), name='cabinet-document-list' + regex=r'^cabinets/(?P[0-9]+)/documents/$', + view=APICabinetDocumentListView.as_view(), name='cabinet-document-list' ), url( - r'^cabinets/(?P[0-9]+)/$', APICabinetView.as_view(), + regex=r'^cabinets/(?P[0-9]+)/$', view=APICabinetView.as_view(), name='cabinet-detail' ), - url(r'^cabinets/$', APICabinetListView.as_view(), name='cabinet-list'), url( - r'^documents/(?P[0-9]+)/cabinets/$', - APIDocumentCabinetListView.as_view(), name='document-cabinet-list' + regex=r'^cabinets/$', view=APICabinetListView.as_view(), + name='cabinet-list' + ), + url( + regex=r'^documents/(?P[0-9]+)/cabinets/$', + view=APIDocumentCabinetListView.as_view(), name='document-cabinet-list' ), ] diff --git a/mayan/apps/checkouts/urls.py b/mayan/apps/checkouts/urls.py index 7338d7897b..994d18edde 100644 --- a/mayan/apps/checkouts/urls.py +++ b/mayan/apps/checkouts/urls.py @@ -9,28 +9,31 @@ from .views import ( ) urlpatterns = [ - url(r'^list/$', CheckoutListView.as_view(), name='check_out_list'), url( - r'^(?P\d+)/check/out/$', CheckoutDocumentView.as_view(), + regex=r'^list/$', view=CheckoutListView.as_view(), name='check_out_list' + ), + url( + regex=r'^(?P\d+)/check/out/$', view=CheckoutDocumentView.as_view(), name='check_out_document' ), url( - r'^(?P\d+)/check/in/$', DocumentCheckinView.as_view(), + regex=r'^(?P\d+)/check/in/$', view=DocumentCheckinView.as_view(), name='check_in_document' ), url( - r'^(?P\d+)/check/info/$', CheckoutDetailView.as_view(), + regex=r'^(?P\d+)/check/info/$', view=CheckoutDetailView.as_view(), name='check_out_info' ), ] api_urls = [ url( - r'^checkouts/$', APICheckedoutDocumentListView.as_view(), + regex=r'^checkouts/$', view=APICheckedoutDocumentListView.as_view(), name='checkout-document-list' ), url( - r'^checkouts/(?P[0-9]+)/checkout_info/$', APICheckedoutDocumentView.as_view(), + regex=r'^checkouts/(?P[0-9]+)/checkout_info/$', + view=APICheckedoutDocumentView.as_view(), name='checkedout-document-view' ), ] diff --git a/mayan/apps/common/apps.py b/mayan/apps/common/apps.py index f043ebe2de..b4fbf96d25 100644 --- a/mayan/apps/common/apps.py +++ b/mayan/apps/common/apps.py @@ -66,8 +66,8 @@ class MayanAppConfig(apps.AppConfig): try: urlpatterns += url( - r'^{}'.format(top_url), - include( + regex=r'^{}'.format(top_url), + view=include( '{}.urls'.format(self.name), namespace=self.app_namespace or self.name ) diff --git a/mayan/apps/common/urls.py b/mayan/apps/common/urls.py index 374f571481..92c0b8f91b 100644 --- a/mayan/apps/common/urls.py +++ b/mayan/apps/common/urls.py @@ -16,75 +16,77 @@ from .views import ( ) urlpatterns = [ - url(r'^$', RootView.as_view(), name='root'), - url(r'^home/$', HomeView.as_view(), name='home'), - url(r'^about/$', AboutView.as_view(), name='about_view'), + url(regex=r'^$', view=RootView.as_view(), name='root'), + url(regex=r'^home/$', view=HomeView.as_view(), name='home'), + url(regex=r'^about/$', view=AboutView.as_view(), name='about_view'), url( - r'^check_version/$', CheckVersionView.as_view(), + regex=r'^check_version/$', view=CheckVersionView.as_view(), name='check_version_view' ), - url(r'^license/$', LicenseView.as_view(), name='license_view'), + url(regex=r'^license/$', view=LicenseView.as_view(), name='license_view'), url( - r'^packages/licenses/$', PackagesLicensesView.as_view(), + regex=r'^packages/licenses/$', view=PackagesLicensesView.as_view(), name='packages_licenses_view' ), url( - r'^object/multiple/action/$', multi_object_action_view, + regex=r'^object/multiple/action/$', view=multi_object_action_view, name='multi_object_action_view' ), - url(r'^setup/$', SetupListView.as_view(), name='setup_list'), - url(r'^tools/$', ToolsListView.as_view(), name='tools_list'), + url(regex=r'^setup/$', view=SetupListView.as_view(), name='setup_list'), + url(regex=r'^tools/$', view=ToolsListView.as_view(), name='tools_list'), url( - r'^user/$', CurrentUserDetailsView.as_view(), + regex=r'^user/$', view=CurrentUserDetailsView.as_view(), name='current_user_details' ), url( - r'^user/edit/$', CurrentUserEditView.as_view(), + regex=r'^user/edit/$', view=CurrentUserEditView.as_view(), name='current_user_edit' ), url( - r'^user/locale/$', CurrentUserLocaleProfileDetailsView.as_view(), + regex=r'^user/locale/$', + view=CurrentUserLocaleProfileDetailsView.as_view(), name='current_user_locale_profile_details' ), url( - r'^user/locale/edit/$', CurrentUserLocaleProfileEditView.as_view(), + regex=r'^user/locale/edit/$', + view=CurrentUserLocaleProfileEditView.as_view(), name='current_user_locale_profile_edit' ), url( - r'^object/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/errors/$', - ObjectErrorLogEntryListView.as_view(), name='object_error_list' + regex=r'^object/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/errors/$', + view=ObjectErrorLogEntryListView.as_view(), name='object_error_list' ), url( - r'^object/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/errors/clear/$', - ObjectErrorLogEntryListClearView.as_view(), + regex=r'^object/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/errors/clear/$', + view=ObjectErrorLogEntryListClearView.as_view(), name='object_error_list_clear' ), ] urlpatterns += [ url( - r'^favicon\.ico$', FaviconRedirectView.as_view() + regex=r'^favicon\.ico$', view=FaviconRedirectView.as_view() ), url( - r'^jsi18n/(?P\S+?)/$', javascript_catalog, + regex=r'^jsi18n/(?P\S+?)/$', view=javascript_catalog, name='javascript_catalog' ), url( - r'^set_language/$', set_language, name='set_language' + regex=r'^set_language/$', view=set_language, name='set_language' ), ] api_urls = [ url( - r'^content_types/$', APIContentTypeList.as_view(), + regex=r'^content_types/$', view=APIContentTypeList.as_view(), name='content-type-list' ), url( - r'^templates/$', APITemplateListView.as_view(), + regex=r'^templates/$', view=APITemplateListView.as_view(), name='template-list' ), url( - r'^templates/(?P[-\w]+)/$', APITemplateDetailView.as_view(), - name='template-detail' + regex=r'^templates/(?P[-\w]+)/$', + view=APITemplateDetailView.as_view(), name='template-detail' ), ] diff --git a/mayan/apps/converter/urls.py b/mayan/apps/converter/urls.py index 56f7abc955..a43042decd 100644 --- a/mayan/apps/converter/urls.py +++ b/mayan/apps/converter/urls.py @@ -9,19 +9,19 @@ from .views import ( urlpatterns = [ url( - r'^create_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', - TransformationCreateView.as_view(), name='transformation_create' + regex=r'^create_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', + view=TransformationCreateView.as_view(), name='transformation_create' ), url( - r'^list_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', - TransformationListView.as_view(), name='transformation_list' + regex=r'^list_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', + view=TransformationListView.as_view(), name='transformation_list' ), url( - r'^delete/(?P\d+)/$', TransformationDeleteView.as_view(), + regex=r'^delete/(?P\d+)/$', view=TransformationDeleteView.as_view(), name='transformation_delete' ), url( - r'^edit/(?P\d+)/$', TransformationEditView.as_view(), + regex=r'^edit/(?P\d+)/$', view=TransformationEditView.as_view(), name='transformation_edit' ), ] diff --git a/mayan/apps/django_gpg/urls.py b/mayan/apps/django_gpg/urls.py index ac21c86d2d..a3f4ba10ad 100644 --- a/mayan/apps/django_gpg/urls.py +++ b/mayan/apps/django_gpg/urls.py @@ -11,39 +11,43 @@ from .views import ( urlpatterns = [ url( - r'^(?P\d+)/$', KeyDetailView.as_view(), name='key_detail' + regex=r'^(?P\d+)/$', view=KeyDetailView.as_view(), + name='key_detail' ), url( - r'^(?P\d+)/delete/$', KeyDeleteView.as_view(), name='key_delete' + regex=r'^(?P\d+)/delete/$', view=KeyDeleteView.as_view(), + name='key_delete' ), url( - r'^(?P\d+)/download/$', KeyDownloadView.as_view(), + regex=r'^(?P\d+)/download/$', view=KeyDownloadView.as_view(), name='key_download' ), url( - r'^list/private/$', PrivateKeyListView.as_view(), + regex=r'^list/private/$', view=PrivateKeyListView.as_view(), name='key_private_list' ), url( - r'^list/public/$', PublicKeyListView.as_view(), name='key_public_list' + regex=r'^list/public/$', view=PublicKeyListView.as_view(), + name='key_public_list' ), url( - r'^upload/$', KeyUploadView.as_view(), name='key_upload' + regex=r'^upload/$', view=KeyUploadView.as_view(), name='key_upload' ), - url(r'^query/$', KeyQueryView.as_view(), name='key_query'), + url(regex=r'^query/$', view=KeyQueryView.as_view(), name='key_query'), url( - r'^query/results/$', KeyQueryResultView.as_view(), + regex=r'^query/results/$', view=KeyQueryResultView.as_view(), name='key_query_results' ), url( - r'^receive/(?P.+)/$', KeyReceive.as_view(), name='key_receive' + regex=r'^receive/(?P.+)/$', view=KeyReceive.as_view(), + name='key_receive' ), ] api_urls = [ url( - r'^keys/(?P[0-9]+)/$', APIKeyView.as_view(), + regex=r'^keys/(?P[0-9]+)/$', view=APIKeyView.as_view(), name='key-detail' ), - url(r'^keys/$', APIKeyListView.as_view(), name='key-list'), + url(regex=r'^keys/$', view=APIKeyListView.as_view(), name='key-list'), ] diff --git a/mayan/apps/document_comments/urls.py b/mayan/apps/document_comments/urls.py index 2dd6929abf..2790e33d2e 100644 --- a/mayan/apps/document_comments/urls.py +++ b/mayan/apps/document_comments/urls.py @@ -10,26 +10,26 @@ from .views import ( urlpatterns = [ url( - r'^comment/(?P\d+)/delete/$', DocumentCommentDeleteView.as_view(), - name='comment_delete' + regex=r'^comment/(?P\d+)/delete/$', + view=DocumentCommentDeleteView.as_view(), name='comment_delete' ), url( - r'^(?P\d+)/comment/add/$', DocumentCommentCreateView.as_view(), - name='comment_add' + regex=r'^(?P\d+)/comment/add/$', + view=DocumentCommentCreateView.as_view(), name='comment_add' ), url( - r'^(?P\d+)/comment/list/$', - DocumentCommentListView.as_view(), name='comments_for_document' + regex=r'^(?P\d+)/comment/list/$', + view=DocumentCommentListView.as_view(), name='comments_for_document' ), ] api_urls = [ url( - r'^documents/(?P[0-9]+)/comments/$', - APICommentListView.as_view(), name='comment-list' + regex=r'^documents/(?P[0-9]+)/comments/$', + view=APICommentListView.as_view(), name='comment-list' ), url( - r'^documents/(?P[0-9]+)/comments/(?P[0-9]+)/$', - APICommentView.as_view(), name='comment-detail' + regex=r'^documents/(?P[0-9]+)/comments/(?P[0-9]+)/$', + view=APICommentView.as_view(), name='comment-detail' ), ] diff --git a/mayan/apps/document_indexing/urls.py b/mayan/apps/document_indexing/urls.py index 3ee1fd0bbd..abc206f052 100644 --- a/mayan/apps/document_indexing/urls.py +++ b/mayan/apps/document_indexing/urls.py @@ -17,80 +17,84 @@ from .views import ( urlpatterns = [ url( - r'^setup/index/list/$', SetupIndexListView.as_view(), + regex=r'^setup/index/list/$', view=SetupIndexListView.as_view(), name='index_setup_list' ), url( - r'^setup/index/create/$', SetupIndexCreateView.as_view(), + regex=r'^setup/index/create/$', view=SetupIndexCreateView.as_view(), name='index_setup_create' ), url( - r'^setup/index/(?P\d+)/edit/$', SetupIndexEditView.as_view(), - name='index_setup_edit' + regex=r'^setup/index/(?P\d+)/edit/$', + view=SetupIndexEditView.as_view(), name='index_setup_edit' ), url( - r'^setup/index/(?P\d+)/delete/$', SetupIndexDeleteView.as_view(), - name='index_setup_delete' + regex=r'^setup/index/(?P\d+)/delete/$', + view=SetupIndexDeleteView.as_view(), name='index_setup_delete' ), url( - r'^setup/index/(?P\d+)/template/$', - SetupIndexTreeTemplateListView.as_view(), name='index_setup_view' + regex=r'^setup/index/(?P\d+)/template/$', + view=SetupIndexTreeTemplateListView.as_view(), name='index_setup_view' ), url( - r'^setup/index/(?P\d+)/document_types/$', - SetupIndexDocumentTypesView.as_view(), + regex=r'^setup/index/(?P\d+)/document_types/$', + view=SetupIndexDocumentTypesView.as_view(), name='index_setup_document_types' ), url( - r'^setup/template/node/(?P\d+)/create/child/$', - TemplateNodeCreateView.as_view(), name='template_node_create' + regex=r'^setup/template/node/(?P\d+)/create/child/$', + view=TemplateNodeCreateView.as_view(), name='template_node_create' ), url( - r'^setup/template/node/(?P\d+)/edit/$', - TemplateNodeEditView.as_view(), name='template_node_edit' + regex=r'^setup/template/node/(?P\d+)/edit/$', + view=TemplateNodeEditView.as_view(), name='template_node_edit' ), url( - r'^setup/template/node/(?P\d+)/delete/$', - TemplateNodeDeleteView.as_view(), name='template_node_delete' - ), - - url(r'^index/list/$', IndexListView.as_view(), name='index_list'), - url( - r'^instance/node/(?P\d+)/$', IndexInstanceNodeView.as_view(), - name='index_instance_node_view' + regex=r'^setup/template/node/(?P\d+)/delete/$', + view=TemplateNodeDeleteView.as_view(), name='template_node_delete' ), url( - r'^rebuild/all/$', RebuildIndexesView.as_view(), + regex=r'^index/list/$', view=IndexListView.as_view(), name='index_list' + ), + url( + regex=r'^instance/node/(?P\d+)/$', + view=IndexInstanceNodeView.as_view(), name='index_instance_node_view' + ), + + url( + regex=r'^rebuild/all/$', view=RebuildIndexesView.as_view(), name='rebuild_index_instances' ), url( - r'^list/for/document/(?P\d+)/$', - DocumentIndexNodeListView.as_view(), name='document_index_list' + regex=r'^list/for/document/(?P\d+)/$', + view=DocumentIndexNodeListView.as_view(), name='document_index_list' ), ] api_urls = [ url( - r'^indexes/node/(?P[0-9]+)/documents/$', - APIIndexNodeInstanceDocumentListView.as_view(), + regex=r'^indexes/node/(?P[0-9]+)/documents/$', + view=APIIndexNodeInstanceDocumentListView.as_view(), name='index-node-documents' ), url( - r'^indexes/template/(?P[0-9]+)/$', APIIndexTemplateView.as_view(), - name='index-template-detail' + regex=r'^indexes/template/(?P[0-9]+)/$', + view=APIIndexTemplateView.as_view(), name='index-template-detail' ), url( - r'^indexes/(?P[0-9]+)/$', APIIndexView.as_view(), + regex=r'^indexes/(?P[0-9]+)/$', view=APIIndexView.as_view(), name='index-detail' ), url( - r'^indexes/(?P[0-9]+)/template/$', - APIIndexTemplateListView.as_view(), name='index-template-detail' + regex=r'^indexes/(?P[0-9]+)/template/$', + view=APIIndexTemplateListView.as_view(), name='index-template-detail' ), - url(r'^indexes/$', APIIndexListView.as_view(), name='index-list'), url( - r'^documents/(?P[0-9]+)/indexes/$', - APIDocumentIndexListView.as_view(), name='document-index-list' + regex=r'^indexes/$', view=APIIndexListView.as_view(), name='index-list' + ), + url( + regex=r'^documents/(?P[0-9]+)/indexes/$', + view=APIDocumentIndexListView.as_view(), name='document-index-list' ), ] diff --git a/mayan/apps/document_parsing/urls.py b/mayan/apps/document_parsing/urls.py index 08e5f3c289..20de63eefd 100644 --- a/mayan/apps/document_parsing/urls.py +++ b/mayan/apps/document_parsing/urls.py @@ -12,46 +12,49 @@ from .views import ( urlpatterns = [ url( - r'^documents/(?P\d+)/content/$', DocumentContentView.as_view(), - name='document_content' + regex=r'^documents/(?P\d+)/content/$', + view=DocumentContentView.as_view(), name='document_content' ), url( - r'^documents/pages/(?P\d+)/content/$', - DocumentPageContentView.as_view(), name='document_page_content' + regex=r'^documents/pages/(?P\d+)/content/$', + view=DocumentPageContentView.as_view(), name='document_page_content' ), url( - r'^documents/(?P\d+)/content/download/$', - DocumentContentDownloadView.as_view(), name='document_content_download' + regex=r'^documents/(?P\d+)/content/download/$', + view=DocumentContentDownloadView.as_view(), name='document_content_download' ), url( - r'^document_types/submit/$', DocumentTypeSubmitView.as_view(), - name='document_type_submit' + regex=r'^document_types/submit/$', + view=DocumentTypeSubmitView.as_view(), name='document_type_submit' ), url( - r'^document_types/(?P\d+)/parsing/settings/$', - DocumentTypeSettingsEditView.as_view(), + regex=r'^document_types/(?P\d+)/parsing/settings/$', + view=DocumentTypeSettingsEditView.as_view(), name='document_type_parsing_settings' ), url( - r'^documents/(?P\d+)/submit/$', DocumentSubmitView.as_view(), - name='document_submit' + regex=r'^documents/(?P\d+)/submit/$', + view=DocumentSubmitView.as_view(), name='document_submit' ), url( - r'^documents/multiple/submit/$', DocumentSubmitView.as_view(), - name='document_submit_multiple' + regex=r'^documents/multiple/submit/$', + view=DocumentSubmitView.as_view(), name='document_submit_multiple' ), url( - r'^documents/(?P\d+)/errors/$', - DocumentParsingErrorsListView.as_view(), + regex=r'^documents/(?P\d+)/errors/$', + view=DocumentParsingErrorsListView.as_view(), name='document_parsing_error_list' ), - url(r'^errors/all/$', ParseErrorListView.as_view(), name='error_list'), + url( + regex=r'^errors/all/$', view=ParseErrorListView.as_view(), + name='error_list' + ), ] api_urls = [ url( - r'^documents/(?P\d+)/versions/(?P\d+)/pages/(?P\d+)/content/$', - APIDocumentPageContentView.as_view(), + regex=r'^documents/(?P\d+)/versions/(?P\d+)/pages/(?P\d+)/content/$', + view=APIDocumentPageContentView.as_view(), name='document-page-content-view' ), ] diff --git a/mayan/apps/document_signatures/urls.py b/mayan/apps/document_signatures/urls.py index 0756750877..a70ec1c85c 100644 --- a/mayan/apps/document_signatures/urls.py +++ b/mayan/apps/document_signatures/urls.py @@ -12,43 +12,43 @@ from .views import ( urlpatterns = [ url( - r'^(?P\d+)/details/$', - DocumentVersionSignatureDetailView.as_view(), + regex=r'^(?P\d+)/details/$', + view=DocumentVersionSignatureDetailView.as_view(), name='document_version_signature_details' ), url( - r'^signature/(?P\d+)/download/$', - DocumentVersionSignatureDownloadView.as_view(), + regex=r'^signature/(?P\d+)/download/$', + view=DocumentVersionSignatureDownloadView.as_view(), name='document_version_signature_download' ), url( - r'^document/version/(?P\d+)/signatures/list/$', - DocumentVersionSignatureListView.as_view(), + regex=r'^document/version/(?P\d+)/signatures/list/$', + view=DocumentVersionSignatureListView.as_view(), name='document_version_signature_list' ), url( - r'^documents/version/(?P\d+)/signature/detached/upload/$', - DocumentVersionSignatureUploadView.as_view(), + regex=r'^documents/version/(?P\d+)/signature/detached/upload/$', + view=DocumentVersionSignatureUploadView.as_view(), name='document_version_signature_upload' ), url( - r'^documents/version/(?P\d+)/signature/detached/create/$', - DocumentVersionDetachedSignatureCreateView.as_view(), + regex=r'^documents/version/(?P\d+)/signature/detached/create/$', + view=DocumentVersionDetachedSignatureCreateView.as_view(), name='document_version_signature_detached_create' ), url( - r'^documents/version/(?P\d+)/signature/embedded/create/$', - DocumentVersionEmbeddedSignatureCreateView.as_view(), + regex=r'^documents/version/(?P\d+)/signature/embedded/create/$', + view=DocumentVersionEmbeddedSignatureCreateView.as_view(), name='document_version_signature_embedded_create' ), url( - r'^signature/(?P\d+)/delete/$', - DocumentVersionSignatureDeleteView.as_view(), + regex=r'^signature/(?P\d+)/delete/$', + view=DocumentVersionSignatureDeleteView.as_view(), name='document_version_signature_delete' ), url( - r'^tools/all/document/version/signature/verify/$', - AllDocumentSignatureVerifyView.as_view(), + regex=r'^tools/all/document/version/signature/verify/$', + view=AllDocumentSignatureVerifyView.as_view(), name='all_document_version_signature_verify' ), ] diff --git a/mayan/apps/document_states/urls.py b/mayan/apps/document_states/urls.py index e5fb3e085e..753ffc1b57 100644 --- a/mayan/apps/document_states/urls.py +++ b/mayan/apps/document_states/urls.py @@ -28,208 +28,213 @@ from .views import ( urlpatterns = [ url( - r'^document/(?P\d+)/workflows/$', - DocumentWorkflowInstanceListView.as_view(), + regex=r'^document/(?P\d+)/workflows/$', + view=DocumentWorkflowInstanceListView.as_view(), name='document_workflow_instance_list' ), url( - r'^document/workflows/(?P\d+)/$', - WorkflowInstanceDetailView.as_view(), name='workflow_instance_detail' + regex=r'^document/workflows/(?P\d+)/$', + view=WorkflowInstanceDetailView.as_view(), + name='workflow_instance_detail' ), url( - r'^document/workflows/(?P\d+)/transition/$', - WorkflowInstanceTransitionView.as_view(), + regex=r'^document/workflows/(?P\d+)/transition/$', + view=WorkflowInstanceTransitionView.as_view(), name='workflow_instance_transition' ), url( - r'^setup/all/$', SetupWorkflowListView.as_view(), + regex=r'^setup/all/$', view=SetupWorkflowListView.as_view(), name='setup_workflow_list' ), url( - r'^setup/create/$', SetupWorkflowCreateView.as_view(), + regex=r'^setup/create/$', view=SetupWorkflowCreateView.as_view(), name='setup_workflow_create' ), url( - r'^setup/workflow/(?P\d+)/edit/$', SetupWorkflowEditView.as_view(), - name='setup_workflow_edit' + regex=r'^setup/workflow/(?P\d+)/edit/$', + view=SetupWorkflowEditView.as_view(), name='setup_workflow_edit' ), url( - r'^setup/workflow/(?P\d+)/delete/$', SetupWorkflowDeleteView.as_view(), - name='setup_workflow_delete' + regex=r'^setup/workflow/(?P\d+)/delete/$', + view=SetupWorkflowDeleteView.as_view(), name='setup_workflow_delete' ), url( - r'^setup/workflow/(?P\d+)/documents/$', - WorkflowDocumentListView.as_view(), + regex=r'^setup/workflow/(?P\d+)/documents/$', + view=WorkflowDocumentListView.as_view(), name='setup_workflow_document_list' ), url( - r'^setup/workflow/(?P\d+)/document_types/$', - SetupWorkflowDocumentTypesView.as_view(), + regex=r'^setup/workflow/(?P\d+)/document_types/$', + view=SetupWorkflowDocumentTypesView.as_view(), name='setup_workflow_document_types' ), url( - r'^setup/workflow/(?P\d+)/states/$', SetupWorkflowStateListView.as_view(), + regex=r'^setup/workflow/(?P\d+)/states/$', + view=SetupWorkflowStateListView.as_view(), name='setup_workflow_state_list' ), url( - r'^setup/workflow/(?P\d+)/states/create/$', - SetupWorkflowStateCreateView.as_view(), + regex=r'^setup/workflow/(?P\d+)/states/create/$', + view=SetupWorkflowStateCreateView.as_view(), name='setup_workflow_state_create' ), url( - r'^setup/workflow/(?P\d+)/transitions/$', - SetupWorkflowTransitionListView.as_view(), + regex=r'^setup/workflow/(?P\d+)/transitions/$', + view=SetupWorkflowTransitionListView.as_view(), name='setup_workflow_transition_list' ), url( - r'^setup/workflow/(?P\d+)/transitions/create/$', - SetupWorkflowTransitionCreateView.as_view(), + regex=r'^setup/workflow/(?P\d+)/transitions/create/$', + view=SetupWorkflowTransitionCreateView.as_view(), name='setup_workflow_transition_create' ), url( - r'^setup/workflow/(?P\d+)/transitions/events/$', - SetupWorkflowTransitionTriggerEventListView.as_view(), + regex=r'^setup/workflow/(?P\d+)/transitions/events/$', + view=SetupWorkflowTransitionTriggerEventListView.as_view(), name='setup_workflow_transition_events' ), url( - r'^setup/workflow/state/(?P\d+)/delete/$', - SetupWorkflowStateDeleteView.as_view(), + regex=r'^setup/workflow/state/(?P\d+)/delete/$', + view=SetupWorkflowStateDeleteView.as_view(), name='setup_workflow_state_delete' ), url( - r'^setup/workflow/state/(?P\d+)/edit/$', - SetupWorkflowStateEditView.as_view(), + regex=r'^setup/workflow/state/(?P\d+)/edit/$', + view=SetupWorkflowStateEditView.as_view(), name='setup_workflow_state_edit' ), url( - r'^setup/workflow/state/(?P\d+)/actions/$', - SetupWorkflowStateActionListView.as_view(), + regex=r'^setup/workflow/state/(?P\d+)/actions/$', + view=SetupWorkflowStateActionListView.as_view(), name='setup_workflow_state_action_list' ), url( - r'^setup/workflow/state/(?P\d+)/actions/$', - SetupWorkflowStateActionListView.as_view(), + regex=r'^setup/workflow/state/(?P\d+)/actions/$', + view=SetupWorkflowStateActionListView.as_view(), name='setup_workflow_state_action_list' ), url( - r'^setup/workflow/state/(?P\d+)/actions/selection/$', - SetupWorkflowStateActionSelectionView.as_view(), + regex=r'^setup/workflow/state/(?P\d+)/actions/selection/$', + view=SetupWorkflowStateActionSelectionView.as_view(), name='setup_workflow_state_action_selection' ), url( - r'^setup/workflow/state/(?P\d+)/actions/(?P[a-zA-Z0-9_.]+)/create/$', - SetupWorkflowStateActionCreateView.as_view(), + regex=r'^setup/workflow/state/(?P\d+)/actions/(?P[a-zA-Z0-9_.]+)/create/$', + view=SetupWorkflowStateActionCreateView.as_view(), name='setup_workflow_state_action_create' ), - url( - r'^setup/workflow/state/actions/(?P\d+)/delete/$', - SetupWorkflowStateActionDeleteView.as_view(), + regex=r'^setup/workflow/state/actions/(?P\d+)/delete/$', + view=SetupWorkflowStateActionDeleteView.as_view(), name='setup_workflow_state_action_delete' ), url( - r'^setup/workflow/state/actions/(?P\d+)/edit/$', - SetupWorkflowStateActionEditView.as_view(), + regex=r'^setup/workflow/state/actions/(?P\d+)/edit/$', + view=SetupWorkflowStateActionEditView.as_view(), name='setup_workflow_state_action_edit' ), - - url( - r'^setup/workflow/transitions/(?P\d+)/delete/$', - SetupWorkflowTransitionDeleteView.as_view(), + regex=r'^setup/workflow/transitions/(?P\d+)/delete/$', + view=SetupWorkflowTransitionDeleteView.as_view(), name='setup_workflow_transition_delete' ), url( - r'^setup/workflow/transitions/(?P\d+)/edit/$', - SetupWorkflowTransitionEditView.as_view(), + regex=r'^setup/workflow/transitions/(?P\d+)/edit/$', + view=SetupWorkflowTransitionEditView.as_view(), name='setup_workflow_transition_edit' ), url( - r'^tools/workflow/all/launch/$', - ToolLaunchAllWorkflows.as_view(), + regex=r'^tools/workflow/all/launch/$', + view=ToolLaunchAllWorkflows.as_view(), name='tool_launch_all_workflows' ), url( - r'all/$', - WorkflowListView.as_view(), + regex=r'all/$', + view=WorkflowListView.as_view(), name='workflow_list' ), url( - r'^(?P\d+)/documents/$', - WorkflowDocumentListView.as_view(), + regex=r'^(?P\d+)/documents/$', + view=WorkflowDocumentListView.as_view(), name='workflow_document_list' ), - url( - r'^(?P\d+)/states/$', - WorkflowStateListView.as_view(), + regex=r'^(?P\d+)/states/$', + view=WorkflowStateListView.as_view(), name='workflow_state_list' ), url( - r'^(?P\d+)/image/$', - WorkflowImageView.as_view(), + regex=r'^(?P\d+)/image/$', + view=WorkflowImageView.as_view(), name='workflow_image' ), url( - r'^(?P\d+)/preview/$', - WorkflowPreviewView.as_view(), + regex=r'^(?P\d+)/preview/$', + view=WorkflowPreviewView.as_view(), name='workflow_preview' ), url( - r'^state/(?P\d+)/documents/$', - WorkflowStateDocumentListView.as_view(), + regex=r'^state/(?P\d+)/documents/$', + view=WorkflowStateDocumentListView.as_view(), name='workflow_state_document_list' ), ] api_urls = [ - url(r'^workflows/$', APIWorkflowListView.as_view(), name='workflow-list'), url( - r'^workflows/(?P[0-9]+)/$', APIWorkflowView.as_view(), + regex=r'^workflows/$', view=APIWorkflowListView.as_view(), + name='workflow-list' + ), + url( + regex=r'^workflows/(?P[0-9]+)/$', view=APIWorkflowView.as_view(), name='workflow-detail' ), url( - r'^workflows/(?P[0-9]+)/document_types/$', - APIWorkflowDocumentTypeList.as_view(), + regex=r'^workflows/(?P[0-9]+)/document_types/$', + view=APIWorkflowDocumentTypeList.as_view(), name='workflow-document-type-list' ), url( - r'^workflows/(?P[0-9]+)/document_types/(?P[0-9]+)/$', - APIWorkflowDocumentTypeView.as_view(), + regex=r'^workflows/(?P[0-9]+)/document_types/(?P[0-9]+)/$', + view=APIWorkflowDocumentTypeView.as_view(), name='workflow-document-type-detail' ), url( - r'^workflows/(?P[0-9]+)/states/$', - APIWorkflowStateListView.as_view(), name='workflowstate-list' + regex=r'^workflows/(?P[0-9]+)/states/$', + view=APIWorkflowStateListView.as_view(), name='workflowstate-list' ), url( - r'^workflows/(?P[0-9]+)/states/(?P[0-9]+)/$', - APIWorkflowStateView.as_view(), name='workflowstate-detail' + regex=r'^workflows/(?P[0-9]+)/states/(?P[0-9]+)/$', + view=APIWorkflowStateView.as_view(), name='workflowstate-detail' ), url( - r'^workflows/(?P[0-9]+)/transitions/$', - APIWorkflowTransitionListView.as_view(), name='workflowtransition-list' + regex=r'^workflows/(?P[0-9]+)/transitions/$', + view=APIWorkflowTransitionListView.as_view(), + name='workflowtransition-list' ), url( - r'^workflows/(?P[0-9]+)/transitions/(?P[0-9]+)/$', - APIWorkflowTransitionView.as_view(), name='workflowtransition-detail' + regex=r'^workflows/(?P[0-9]+)/transitions/(?P[0-9]+)/$', + view=APIWorkflowTransitionView.as_view(), + name='workflowtransition-detail' ), url( - r'^documents/(?P[0-9]+)/workflows/$', - APIWorkflowInstanceListView.as_view(), name='workflowinstance-list' + regex=r'^documents/(?P[0-9]+)/workflows/$', + view=APIWorkflowInstanceListView.as_view(), + name='workflowinstance-list' ), url( - r'^documents/(?P[0-9]+)/workflows/(?P[0-9]+)/$', - APIWorkflowInstanceView.as_view(), name='workflowinstance-detail' + regex=r'^documents/(?P[0-9]+)/workflows/(?P[0-9]+)/$', + view=APIWorkflowInstanceView.as_view(), + name='workflowinstance-detail' ), url( - r'^documents/(?P[0-9]+)/workflows/(?P[0-9]+)/log_entries/$', - APIWorkflowInstanceLogEntryListView.as_view(), + regex=r'^documents/(?P[0-9]+)/workflows/(?P[0-9]+)/log_entries/$', + view=APIWorkflowInstanceLogEntryListView.as_view(), name='workflowinstancelogentry-list' ), url( - r'^document_types/(?P[0-9]+)/workflows/$', - APIDocumentTypeWorkflowListView.as_view(), + regex=r'^document_types/(?P[0-9]+)/workflows/$', + view=APIDocumentTypeWorkflowListView.as_view(), name='documenttype-workflow-list' ), ] diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py index 897025aeb7..3ae6b9ce09 100644 --- a/mayan/apps/documents/urls.py +++ b/mayan/apps/documents/urls.py @@ -39,333 +39,353 @@ from .views import ( urlpatterns = [ - url(r'^list/$', DocumentListView.as_view(), name='document_list'), url( - r'^list/recent_access/$', RecentAccessDocumentListView.as_view(), + regex=r'^list/$', view=DocumentListView.as_view(), name='document_list' + ), + url( + regex=r'^list/recent_access/$', + view=RecentAccessDocumentListView.as_view(), name='document_list_recent_access' ), url( - r'^list/recent_added/$', RecentAddedDocumentListView.as_view(), + regex=r'^list/recent_added/$', + view=RecentAddedDocumentListView.as_view(), name='document_list_recent_added' ), url( - r'^list/deleted/$', DeletedDocumentListView.as_view(), + regex=r'^list/deleted/$', view=DeletedDocumentListView.as_view(), name='document_list_deleted' ), url( - r'^list/duplicated/$', - DuplicatedDocumentListView.as_view(), + regex=r'^list/duplicated/$', + view=DuplicatedDocumentListView.as_view(), name='duplicated_document_list' ), url( - r'^list/favorites/$', FavoriteDocumentListView.as_view(), + regex=r'^list/favorites/$', view=FavoriteDocumentListView.as_view(), name='document_list_favorites' ), url( - r'^(?P\d+)/preview/$', DocumentPreviewView.as_view(), + regex=r'^(?P\d+)/preview/$', view=DocumentPreviewView.as_view(), name='document_preview' ), url( - r'^(?P\d+)/properties/$', DocumentView.as_view(), + regex=r'^(?P\d+)/properties/$', view=DocumentView.as_view(), name='document_properties' ), url( - r'^(?P\d+)/duplicates/$', DocumentDuplicatesListView.as_view(), + regex=r'^(?P\d+)/duplicates/$', + view=DocumentDuplicatesListView.as_view(), name='document_duplicates_list' ), url( - r'^(?P\d+)/add_to_favorites/$', FavoriteAddView.as_view(), - name='document_add_to_favorites' + regex=r'^(?P\d+)/add_to_favorites/$', + view=FavoriteAddView.as_view(), name='document_add_to_favorites' ), url( - r'^multiple/add_to_favorites/$', FavoriteAddView.as_view(), + regex=r'^multiple/add_to_favorites/$', view=FavoriteAddView.as_view(), name='document_multiple_add_to_favorites' ), url( - r'^(?P\d+)/remove_from_favorites/$', FavoriteRemoveView.as_view(), + regex=r'^(?P\d+)/remove_from_favorites/$', + view=FavoriteRemoveView.as_view(), name='document_remove_from_favorites' ), url( - r'^multiple/remove_from_favorites/$', FavoriteRemoveView.as_view(), + regex=r'^multiple/remove_from_favorites/$', + view=FavoriteRemoveView.as_view(), name='document_multiple_remove_from_favorites' ), url( - r'^(?P\d+)/restore/$', DocumentRestoreView.as_view(), + regex=r'^(?P\d+)/restore/$', view=DocumentRestoreView.as_view(), name='document_restore' ), url( - r'^multiple/restore/$', DocumentRestoreManyView.as_view(), + regex=r'^multiple/restore/$', view=DocumentRestoreManyView.as_view(), name='document_multiple_restore' ), url( - r'^(?P\d+)/delete/$', DeletedDocumentDeleteView.as_view(), - name='document_delete' + regex=r'^(?P\d+)/delete/$', + view=DeletedDocumentDeleteView.as_view(), name='document_delete' ), url( - r'^multiple/delete/$', DeletedDocumentDeleteManyView.as_view(), + regex=r'^multiple/delete/$', + view=DeletedDocumentDeleteManyView.as_view(), name='document_multiple_delete' ), url( - r'^(?P\d+)/type/$', DocumentDocumentTypeEditView.as_view(), + regex=r'^(?P\d+)/type/$', + view=DocumentDocumentTypeEditView.as_view(), name='document_document_type_edit' ), url( - r'^multiple/type/$', DocumentDocumentTypeEditView.as_view(), + regex=r'^multiple/type/$', view=DocumentDocumentTypeEditView.as_view(), name='document_multiple_document_type_edit' ), url( - r'^(?P\d+)/trash/$', DocumentTrashView.as_view(), + regex=r'^(?P\d+)/trash/$', view=DocumentTrashView.as_view(), name='document_trash' ), url( - r'^multiple/trash/$', DocumentTrashManyView.as_view(), + regex=r'^multiple/trash/$', view=DocumentTrashManyView.as_view(), name='document_multiple_trash' ), url( - r'^(?P\d+)/edit/$', DocumentEditView.as_view(), + regex=r'^(?P\d+)/edit/$', view=DocumentEditView.as_view(), name='document_edit' ), url( - r'^(?P\d+)/print/$', DocumentPrint.as_view(), + regex=r'^(?P\d+)/print/$', view=DocumentPrint.as_view(), name='document_print' ), url( - r'^(?P\d+)/reset_page_count/$', - DocumentUpdatePageCountView.as_view(), + regex=r'^(?P\d+)/reset_page_count/$', + view=DocumentUpdatePageCountView.as_view(), name='document_update_page_count' ), url( - r'^multiple/reset_page_count/$', - DocumentUpdatePageCountView.as_view(), + regex=r'^multiple/reset_page_count/$', + view=DocumentUpdatePageCountView.as_view(), name='document_multiple_update_page_count' ), url( - r'^(?P\d+)/download/form/$', - DocumentDownloadFormView.as_view(), name='document_download_form' + regex=r'^(?P\d+)/download/form/$', + view=DocumentDownloadFormView.as_view(), name='document_download_form' ), url( - r'^(?P\d+)/download/$', DocumentDownloadView.as_view(), + regex=r'^(?P\d+)/download/$', view=DocumentDownloadView.as_view(), name='document_download' ), url( - r'^multiple/download/form/$', DocumentDownloadFormView.as_view(), + regex=r'^multiple/download/form/$', + view=DocumentDownloadFormView.as_view(), name='document_multiple_download_form' ), url( - r'^multiple/download/$', DocumentDownloadView.as_view(), + regex=r'^multiple/download/$', view=DocumentDownloadView.as_view(), name='document_multiple_download' ), url( - r'^(?P\d+)/clear_transformations/$', - DocumentTransformationsClearView.as_view(), + regex=r'^(?P\d+)/clear_transformations/$', + view=DocumentTransformationsClearView.as_view(), name='document_clear_transformations' ), url( - r'^(?P\d+)/clone_transformations/$', - DocumentTransformationsCloneView.as_view(), + regex=r'^(?P\d+)/clone_transformations/$', + view=DocumentTransformationsCloneView.as_view(), name='document_clone_transformations' ), url( - r'^(?P\d+)/version/all/$', DocumentVersionListView.as_view(), + regex=r'^(?P\d+)/version/all/$', + view=DocumentVersionListView.as_view(), name='document_version_list' ), url( - r'^document/version/(?P\d+)/download/form/$', - DocumentVersionDownloadFormView.as_view(), + regex=r'^document/version/(?P\d+)/download/form/$', + view=DocumentVersionDownloadFormView.as_view(), name='document_version_download_form' ), url( - r'^document/version/(?P\d+)/$', DocumentVersionView.as_view(), - name='document_version_view' + regex=r'^document/version/(?P\d+)/$', + view=DocumentVersionView.as_view(), name='document_version_view' ), url( - r'^document/version/(?P\d+)/download/$', - DocumentVersionDownloadView.as_view(), name='document_version_download' + regex=r'^document/version/(?P\d+)/download/$', + view=DocumentVersionDownloadView.as_view(), + name='document_version_download' ), url( - r'^document/version/(?P\d+)/revert/$', - DocumentVersionRevertView.as_view(), name='document_version_revert' + regex=r'^document/version/(?P\d+)/revert/$', + view=DocumentVersionRevertView.as_view(), + name='document_version_revert' ), url( - r'^(?P\d+)/pages/all/$', DocumentPageListView.as_view(), + regex=r'^(?P\d+)/pages/all/$', view=DocumentPageListView.as_view(), name='document_pages' ), url( - r'^multiple/clear_transformations/$', - DocumentTransformationsClearView.as_view(), + regex=r'^multiple/clear_transformations/$', + view=DocumentTransformationsClearView.as_view(), name='document_multiple_clear_transformations' ), url( - r'^cache/clear/$', ClearImageCacheView.as_view(), + regex=r'^cache/clear/$', view=ClearImageCacheView.as_view(), name='document_clear_image_cache' ), url( - r'^trash_can/empty/$', EmptyTrashCanView.as_view(), + regex=r'^trash_can/empty/$', view=EmptyTrashCanView.as_view(), name='trash_can_empty' ), url( - r'^page/(?P\d+)/$', DocumentPageView.as_view(), + regex=r'^page/(?P\d+)/$', view=DocumentPageView.as_view(), name='document_page_view' ), url( - r'^page/(?P\d+)/navigation/next/$', - DocumentPageNavigationNext.as_view(), + regex=r'^page/(?P\d+)/navigation/next/$', + view=DocumentPageNavigationNext.as_view(), name='document_page_navigation_next' ), url( - r'^page/(?P\d+)/navigation/previous/$', - DocumentPageNavigationPrevious.as_view(), + regex=r'^page/(?P\d+)/navigation/previous/$', + view=DocumentPageNavigationPrevious.as_view(), name='document_page_navigation_previous' ), url( - r'^page/(?P\d+)/navigation/first/$', - DocumentPageNavigationFirst.as_view(), + regex=r'^page/(?P\d+)/navigation/first/$', + view=DocumentPageNavigationFirst.as_view(), name='document_page_navigation_first' ), url( - r'^page/(?P\d+)/navigation/last/$', - DocumentPageNavigationLast.as_view(), + regex=r'^page/(?P\d+)/navigation/last/$', + view=DocumentPageNavigationLast.as_view(), name='document_page_navigation_last' ), url( - r'^page/(?P\d+)/zoom/in/$', - DocumentPageZoomInView.as_view(), name='document_page_zoom_in' + regex=r'^page/(?P\d+)/zoom/in/$', + view=DocumentPageZoomInView.as_view(), name='document_page_zoom_in' ), url( - r'^page/(?P\d+)/zoom/out/$', - DocumentPageZoomOutView.as_view(), name='document_page_zoom_out' + regex=r'^page/(?P\d+)/zoom/out/$', + view=DocumentPageZoomOutView.as_view(), name='document_page_zoom_out' ), url( - r'^page/(?P\d+)/rotate/left/$', - DocumentPageRotateLeftView.as_view(), name='document_page_rotate_left' + regex=r'^page/(?P\d+)/rotate/left/$', + view=DocumentPageRotateLeftView.as_view(), + name='document_page_rotate_left' ), url( - r'^page/(?P\d+)/rotate/right/$', - DocumentPageRotateRightView.as_view(), + regex=r'^page/(?P\d+)/rotate/right/$', + view=DocumentPageRotateRightView.as_view(), name='document_page_rotate_right' ), url( - r'^page/(?P\d+)/reset/$', DocumentPageViewResetView.as_view(), + regex=r'^page/(?P\d+)/reset/$', + view=DocumentPageViewResetView.as_view(), name='document_page_view_reset' ), # Admin views url( - r'^type/list/$', DocumentTypeListView.as_view(), + regex=r'^type/list/$', view=DocumentTypeListView.as_view(), name='document_type_list' ), url( - r'^type/create/$', DocumentTypeCreateView.as_view(), + regex=r'^type/create/$', view=DocumentTypeCreateView.as_view(), name='document_type_create' ), url( - r'^type/(?P\d+)/edit/$', DocumentTypeEditView.as_view(), + regex=r'^type/(?P\d+)/edit/$', view=DocumentTypeEditView.as_view(), name='document_type_edit' ), url( - r'^type/(?P\d+)/delete/$', DocumentTypeDeleteView.as_view(), - name='document_type_delete' + regex=r'^type/(?P\d+)/delete/$', + view=DocumentTypeDeleteView.as_view(), name='document_type_delete' ), url( - r'^type/(?P\d+)/documents/$', - DocumentTypeDocumentListView.as_view(), + regex=r'^type/(?P\d+)/documents/$', + view=DocumentTypeDocumentListView.as_view(), name='document_type_document_list' ), url( - r'^type/(?P\d+)/filename/list/$', - DocumentTypeFilenameListView.as_view(), + regex=r'^type/(?P\d+)/filename/list/$', + view=DocumentTypeFilenameListView.as_view(), name='document_type_filename_list' ), url( - r'^type/filename/(?P\d+)/edit/$', - DocumentTypeFilenameEditView.as_view(), + regex=r'^type/filename/(?P\d+)/edit/$', + view=DocumentTypeFilenameEditView.as_view(), name='document_type_filename_edit' ), url( - r'^type/filename/(?P\d+)/delete/$', - DocumentTypeFilenameDeleteView.as_view(), + regex=r'^type/filename/(?P\d+)/delete/$', + view=DocumentTypeFilenameDeleteView.as_view(), name='document_type_filename_delete' ), url( - r'^type/(?P\d+)/filename/create/$', - DocumentTypeFilenameCreateView.as_view(), + regex=r'^type/(?P\d+)/filename/create/$', + view=DocumentTypeFilenameCreateView.as_view(), name='document_type_filename_create' ), # Tools url( - r'^tools/documents/duplicated/scan/$', - ScanDuplicatedDocuments.as_view(), + regex=r'^tools/documents/duplicated/scan/$', + view=ScanDuplicatedDocuments.as_view(), name='duplicated_document_scan' ), ] api_urls = [ url( - r'^document_types/(?P[0-9]+)/$', APIDocumentTypeView.as_view(), - name='documenttype-detail' + regex=r'^document_types/(?P[0-9]+)/$', + view=APIDocumentTypeView.as_view(), name='documenttype-detail' ), url( - r'^document_types/$', APIDocumentTypeListView.as_view(), + regex=r'^document_types/$', view=APIDocumentTypeListView.as_view(), name='documenttype-list' ), url( - r'^document_types/(?P[0-9]+)/documents/$', - APIDocumentTypeDocumentListView.as_view(), + regex=r'^document_types/(?P[0-9]+)/documents/$', + view=APIDocumentTypeDocumentListView.as_view(), name='documenttype-document-list' ), - url(r'^documents/$', APIDocumentListView.as_view(), name='document-list'), url( - r'^documents/(?P[0-9]+)/$', APIDocumentView.as_view(), + regex=r'^documents/$', view=APIDocumentListView.as_view(), + name='document-list' + ), + url( + regex=r'^documents/(?P[0-9]+)/$', view=APIDocumentView.as_view(), name='document-detail' ), url( - r'^documents/(?P[0-9]+)/download/$', - APIDocumentDownloadView.as_view(), name='document-download' + regex=r'^documents/(?P[0-9]+)/download/$', + view=APIDocumentDownloadView.as_view(), name='document-download' ), url( - r'^documents/(?P[0-9]+)/versions/$', - APIDocumentVersionsListView.as_view(), name='document-version-list' + regex=r'^documents/(?P[0-9]+)/versions/$', + view=APIDocumentVersionsListView.as_view(), + name='document-version-list' ), url( - r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/$', - APIDocumentVersionView.as_view(), name='documentversion-detail' + regex=r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/$', + view=APIDocumentVersionView.as_view(), name='documentversion-detail' ), url( - r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/pages/$', - APIDocumentVersionPageListView.as_view(), name='documentversion-page-list' + regex=r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/pages/$', + view=APIDocumentVersionPageListView.as_view(), + name='documentversion-page-list' ), url( - r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/download/$', - APIDocumentVersionDownloadView.as_view(), + regex=r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/download/$', + view=APIDocumentVersionDownloadView.as_view(), name='documentversion-download' ), url( - r'^documents/recent/$', APIRecentDocumentListView.as_view(), + regex=r'^documents/recent/$', view=APIRecentDocumentListView.as_view(), name='document-recent-list' ), url( - r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/pages/(?P[0-9]+)$', - APIDocumentPageView.as_view(), name='documentpage-detail' + regex=r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/pages/(?P[0-9]+)$', + view=APIDocumentPageView.as_view(), name='documentpage-detail' ), url( - r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/pages/(?P[0-9]+)/image/$', - APIDocumentPageImageView.as_view(), name='documentpage-image' + regex=r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/pages/(?P[0-9]+)/image/$', + view=APIDocumentPageImageView.as_view(), name='documentpage-image' ), url( - r'^trashed_documents/$', APIDeletedDocumentListView.as_view(), - name='trasheddocument-list' + regex=r'^trashed_documents/$', + view=APIDeletedDocumentListView.as_view(), name='trasheddocument-list' ), url( - r'^trashed_documents/(?P[0-9]+)/$', - APIDeletedDocumentView.as_view(), name='trasheddocument-detail' + regex=r'^trashed_documents/(?P[0-9]+)/$', + view=APIDeletedDocumentView.as_view(), name='trasheddocument-detail' ), url( - r'^trashed_documents/(?P[0-9]+)/restore/$', - APIDeletedDocumentRestoreView.as_view(), name='trasheddocument-restore' + regex=r'^trashed_documents/(?P[0-9]+)/restore/$', + view=APIDeletedDocumentRestoreView.as_view(), name='trasheddocument-restore' ), ] diff --git a/mayan/apps/dynamic_search/urls.py b/mayan/apps/dynamic_search/urls.py index 4558a73d2c..3d4c75ffd1 100644 --- a/mayan/apps/dynamic_search/urls.py +++ b/mayan/apps/dynamic_search/urls.py @@ -10,32 +10,35 @@ from .views import ( ) urlpatterns = [ - url(r'^(?P[\.\w]+)/$', SearchView.as_view(), name='search'), url( - r'^advanced/(?P[\.\w]+)/$', AdvancedSearchView.as_view(), - name='search_advanced' + regex=r'^(?P[\.\w]+)/$', view=SearchView.as_view(), + name='search' ), url( - r'^again/(?P[\.\w]+)/$', SearchAgainView.as_view(), - name='search_again' + regex=r'^advanced/(?P[\.\w]+)/$', + view=AdvancedSearchView.as_view(), name='search_advanced' ), url( - r'^results/(?P[\.\w]+)/$', ResultsView.as_view(), - name='results' + regex=r'^again/(?P[\.\w]+)/$', + view=SearchAgainView.as_view(), name='search_again' + ), + url( + regex=r'^results/(?P[\.\w]+)/$', + view=ResultsView.as_view(), name='results' ), ] api_urls = [ url( - r'^search_models/$', APISearchModelList.as_view(), + regex=r'^search_models/$', view=APISearchModelList.as_view(), name='searchmodel-list' ), url( - r'^search/(?P[\.\w]+)/$', APISearchView.as_view(), - name='search-view' + regex=r'^search/(?P[\.\w]+)/$', + view=APISearchView.as_view(), name='search-view' ), url( - r'^search/advanced/(?P[\.\w]+)/$', APIAdvancedSearchView.as_view(), - name='advanced-search-view' + regex=r'^search/advanced/(?P[\.\w]+)/$', + view=APIAdvancedSearchView.as_view(), name='advanced-search-view' ), ] diff --git a/mayan/apps/events/urls.py b/mayan/apps/events/urls.py index 25b2d9e26c..0c9ac0f4d1 100644 --- a/mayan/apps/events/urls.py +++ b/mayan/apps/events/urls.py @@ -14,69 +14,70 @@ from .views import ( ) urlpatterns = [ - url(r'^all/$', EventListView.as_view(), name='events_list'), + url(regex=r'^all/$', view=EventListView.as_view(), name='events_list'), url( - r'^for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', - ObjectEventListView.as_view(), name='events_for_object' + regex=r'^for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', + view=ObjectEventListView.as_view(), name='events_for_object' ), url( - r'^by_verb/(?P[\w\-\.]+)/$', VerbEventListView.as_view(), - name='events_by_verb' + regex=r'^by_verb/(?P[\w\-\.]+)/$', + view=VerbEventListView.as_view(), name='events_by_verb' ), url( - r'^notifications/(?P\d+)/mark_read/$', - NotificationMarkRead.as_view(), name='notification_mark_read' + regex=r'^notifications/(?P\d+)/mark_read/$', + view=NotificationMarkRead.as_view(), name='notification_mark_read' ), url( - r'^notifications/all/mark_read/$', - NotificationMarkReadAll.as_view(), name='notification_mark_read_all' + regex=r'^notifications/all/mark_read/$', + view=NotificationMarkReadAll.as_view(), name='notification_mark_read_all' ), url( - r'^user/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/subscriptions/$', - ObjectEventTypeSubscriptionListView.as_view(), + regex=r'^user/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/subscriptions/$', + view=ObjectEventTypeSubscriptionListView.as_view(), name='object_event_types_user_subcriptions_list' ), url( - r'^user/(?P\d+)/events/$', UserEventListView.as_view(), + regex=r'^user/(?P\d+)/events/$', view=UserEventListView.as_view(), name='user_events' ), url( - r'^user/event_types/subscriptions/$', - EventTypeSubscriptionListView.as_view(), + regex=r'^user/event_types/subscriptions/$', + view=EventTypeSubscriptionListView.as_view(), name='event_types_user_subcriptions_list' ), url( - r'^user/notifications/$', NotificationListView.as_view(), + regex=r'^user/notifications/$', view=NotificationListView.as_view(), name='user_notifications_list' ), ] api_urls = [ url( - r'^event_type_namespaces/(?P[-\w]+)/$', - APIEventTypeNamespaceDetailView.as_view(), + regex=r'^event_type_namespaces/(?P[-\w]+)/$', + view=APIEventTypeNamespaceDetailView.as_view(), name='event-type-namespace-detail' ), url( - r'^event_type_namespaces/(?P[-\w]+)/event_types/$', - APIEventTypeNamespaceEventTypeListView.as_view(), + regex=r'^event_type_namespaces/(?P[-\w]+)/event_types/$', + view=APIEventTypeNamespaceEventTypeListView.as_view(), name='event-type-namespace-event-type-list' ), url( - r'^event_type_namespaces/$', APIEventTypeNamespaceListView.as_view(), + regex=r'^event_type_namespaces/$', + view=APIEventTypeNamespaceListView.as_view(), name='event-type-namespace-list' ), url( - r'^event_types/$', APIEventTypeListView.as_view(), + regex=r'^event_types/$', view=APIEventTypeListView.as_view(), name='event-type-list' ), - url(r'^events/$', APIEventListView.as_view(), name='event-list'), + url(regex=r'^events/$', view=APIEventListView.as_view(), name='event-list'), url( - r'^notifications/$', APINotificationListView.as_view(), + regex=r'^notifications/$', view=APINotificationListView.as_view(), name='notification-list' ), url( - r'^objects/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/events/$', - APIObjectEventListView.as_view(), name='object-event-list' + regex=r'^objects/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/events/$', + view=APIObjectEventListView.as_view(), name='object-event-list' ), ] diff --git a/mayan/apps/linking/urls.py b/mayan/apps/linking/urls.py index 46eb35e989..73b063ceef 100644 --- a/mayan/apps/linking/urls.py +++ b/mayan/apps/linking/urls.py @@ -17,86 +17,90 @@ from .views import ( urlpatterns = [ url( - r'^document/(?P\d+)/list/$', DocumentSmartLinkListView.as_view(), + regex=r'^document/(?P\d+)/list/$', + view=DocumentSmartLinkListView.as_view(), name='smart_link_instances_for_document' ), url( - r'^document/(?P\d+)/(?P\d+)/$', - ResolvedSmartLinkView.as_view(), name='smart_link_instance_view' + regex=r'^document/(?P\d+)/(?P\d+)/$', + view=ResolvedSmartLinkView.as_view(), name='smart_link_instance_view' ), url( - r'^setup/list/$', SmartLinkListView.as_view(), name='smart_link_list' + regex=r'^setup/list/$', view=SmartLinkListView.as_view(), + name='smart_link_list' ), url( - r'^setup/create/$', SmartLinkCreateView.as_view(), + regex=r'^setup/create/$', view=SmartLinkCreateView.as_view(), name='smart_link_create' ), url( - r'^setup/(?P\d+)/delete/$', - SmartLinkDeleteView.as_view(), name='smart_link_delete' + regex=r'^setup/(?P\d+)/delete/$', + view=SmartLinkDeleteView.as_view(), name='smart_link_delete' ), url( - r'^setup/(?P\d+)/edit/$', SmartLinkEditView.as_view(), + regex=r'^setup/(?P\d+)/edit/$', view=SmartLinkEditView.as_view(), name='smart_link_edit' ), url( - r'^setup/(?P\d+)/document_types/$', - SetupSmartLinkDocumentTypesView.as_view(), + regex=r'^setup/(?P\d+)/document_types/$', + view=SetupSmartLinkDocumentTypesView.as_view(), name='smart_link_document_types' ), - url( - r'^setup/(?P\d+)/condition/list/$', - SmartLinkConditionListView.as_view(), name='smart_link_condition_list' + regex=r'^setup/(?P\d+)/condition/list/$', + view=SmartLinkConditionListView.as_view(), + name='smart_link_condition_list' ), url( - r'^setup/(?P\d+)/condition/create/$', - SmartLinkConditionCreateView.as_view(), + regex=r'^setup/(?P\d+)/condition/create/$', + view=SmartLinkConditionCreateView.as_view(), name='smart_link_condition_create' ), url( - r'^setup/smart_link/condition/(?P\d+)/edit/$', - SmartLinkConditionEditView.as_view(), name='smart_link_condition_edit' + regex=r'^setup/smart_link/condition/(?P\d+)/edit/$', + view=SmartLinkConditionEditView.as_view(), + name='smart_link_condition_edit' ), url( - r'^setup/smart_link/condition/(?P\d+)/delete/$', - SmartLinkConditionDeleteView.as_view(), + regex=r'^setup/smart_link/condition/(?P\d+)/delete/$', + view=SmartLinkConditionDeleteView.as_view(), name='smart_link_condition_delete' ), ] api_urls = [ url( - r'^smart_links/$', APISmartLinkListView.as_view(), + regex=r'^smart_links/$', view=APISmartLinkListView.as_view(), name='smartlink-list' ), url( - r'^smart_links/(?P[0-9]+)/$', APISmartLinkView.as_view(), - name='smartlink-detail' + regex=r'^smart_links/(?P[0-9]+)/$', + view=APISmartLinkView.as_view(), name='smartlink-detail' ), url( - r'^smart_links/(?P[0-9]+)/conditions/$', - APISmartLinkConditionListView.as_view(), name='smartlinkcondition-list' + regex=r'^smart_links/(?P[0-9]+)/conditions/$', + view=APISmartLinkConditionListView.as_view(), + name='smartlinkcondition-list' ), url( - r'^smart_links/(?P[0-9]+)/conditions/(?P[0-9]+)/$', - APISmartLinkConditionView.as_view(), + regex=r'^smart_links/(?P[0-9]+)/conditions/(?P[0-9]+)/$', + view=APISmartLinkConditionView.as_view(), name='smartlinkcondition-detail' ), url( - r'^documents/(?P[0-9]+)/resolved_smart_links/$', - APIResolvedSmartLinkListView.as_view(), + regex=r'^documents/(?P[0-9]+)/resolved_smart_links/$', + view=APIResolvedSmartLinkListView.as_view(), name='resolvedsmartlink-list' ), url( - r'^documents/(?P[0-9]+)/resolved_smart_links/(?P[0-9]+)/$', - APIResolvedSmartLinkView.as_view(), + regex=r'^documents/(?P[0-9]+)/resolved_smart_links/(?P[0-9]+)/$', + view=APIResolvedSmartLinkView.as_view(), name='resolvedsmartlink-detail' ), url( - r'^documents/(?P[0-9]+)/resolved_smart_links/(?P[0-9]+)/documents/$', - APIResolvedSmartLinkDocumentListView.as_view(), + regex=r'^documents/(?P[0-9]+)/resolved_smart_links/(?P[0-9]+)/documents/$', + view=APIResolvedSmartLinkDocumentListView.as_view(), name='resolvedsmartlinkdocument-list' ), ] diff --git a/mayan/apps/mailer/urls.py b/mayan/apps/mailer/urls.py index 06d50780c0..5f6ab328e5 100644 --- a/mayan/apps/mailer/urls.py +++ b/mayan/apps/mailer/urls.py @@ -11,52 +11,52 @@ from .views import ( urlpatterns = [ url( - r'^(?P\d+)/send/link/$', MailDocumentLinkView.as_view(), + regex=r'^(?P\d+)/send/link/$', view=MailDocumentLinkView.as_view(), name='send_document_link' ), url( - r'^multiple/send/link/$', MailDocumentLinkView.as_view(), + regex=r'^multiple/send/link/$', view=MailDocumentLinkView.as_view(), name='send_multiple_document_link' ), url( - r'^(?P\d+)/send/document/$', MailDocumentView.as_view(), + regex=r'^(?P\d+)/send/document/$', view=MailDocumentView.as_view(), name='send_document' ), url( - r'^multiple/send/document/$', MailDocumentView.as_view(), + regex=r'^multiple/send/document/$', view=MailDocumentView.as_view(), name='send_multiple_document' ), url( - r'^system_mailer/log/$', SystemMailerLogEntryListView.as_view(), + regex=r'^system_mailer/log/$', view=SystemMailerLogEntryListView.as_view(), name='system_mailer_error_log' ), url( - r'^user_mailers/backend/selection/$', - UserMailerBackendSelectionView.as_view(), + regex=r'^user_mailers/backend/selection/$', + view=UserMailerBackendSelectionView.as_view(), name='user_mailer_backend_selection' ), url( - r'^user_mailers/(?P[a-zA-Z0-9_.]+)/create/$', - UserMailingCreateView.as_view(), name='user_mailer_create' + regex=r'^user_mailers/(?P[a-zA-Z0-9_.]+)/create/$', + view=UserMailingCreateView.as_view(), name='user_mailer_create' ), url( - r'^user_mailers/(?P\d+)/delete/$', UserMailingDeleteView.as_view(), - name='user_mailer_delete' + regex=r'^user_mailers/(?P\d+)/delete/$', + view=UserMailingDeleteView.as_view(), name='user_mailer_delete' ), url( - r'^user_mailers/(?P\d+)/edit/$', UserMailingEditView.as_view(), - name='user_mailer_edit' + regex=r'^user_mailers/(?P\d+)/edit/$', + view=UserMailingEditView.as_view(), name='user_mailer_edit' ), url( - r'^user_mailers/(?P\d+)/log/$', - UserMailerLogEntryListView.as_view(), name='user_mailer_log' + regex=r'^user_mailers/(?P\d+)/log/$', + view=UserMailerLogEntryListView.as_view(), name='user_mailer_log' ), url( - r'^user_mailers/(?P\d+)/test/$', - UserMailerTestView.as_view(), name='user_mailer_test' + regex=r'^user_mailers/(?P\d+)/test/$', + view=UserMailerTestView.as_view(), name='user_mailer_test' ), url( - r'^user_mailers/$', UserMailerListView.as_view(), + regex=r'^user_mailers/$', view=UserMailerListView.as_view(), name='user_mailer_list' ), ] diff --git a/mayan/apps/mayan_statistics/urls.py b/mayan/apps/mayan_statistics/urls.py index 0dc4733beb..424991df20 100644 --- a/mayan/apps/mayan_statistics/urls.py +++ b/mayan/apps/mayan_statistics/urls.py @@ -8,17 +8,17 @@ from .views import ( ) urlpatterns = [ - url(r'^$', NamespaceListView.as_view(), name='namespace_list'), + url(regex=r'^$', view=NamespaceListView.as_view(), name='namespace_list'), url( - r'^namespace/(?P[\w-]+)/details/$', - NamespaceDetailView.as_view(), name='namespace_details' + regex=r'^namespace/(?P[\w-]+)/details/$', + view=NamespaceDetailView.as_view(), name='namespace_details' ), url( - r'^(?P[\w-]+)/view/$', StatisticDetailView.as_view(), + regex=r'^(?P[\w-]+)/view/$', view=StatisticDetailView.as_view(), name='statistic_detail' ), url( - r'^(?P[\w-]+)/queue/$', StatisticQueueView.as_view(), + regex=r'^(?P[\w-]+)/queue/$', view=StatisticQueueView.as_view(), name='statistic_queue' ), ] diff --git a/mayan/apps/metadata/urls.py b/mayan/apps/metadata/urls.py index 52360725ae..05bcbfd638 100644 --- a/mayan/apps/metadata/urls.py +++ b/mayan/apps/metadata/urls.py @@ -17,87 +17,86 @@ from .views import ( urlpatterns = [ url( - r'^(?P\d+)/edit/$', DocumentMetadataEditView.as_view(), + regex=r'^(?P\d+)/edit/$', view=DocumentMetadataEditView.as_view(), name='metadata_edit' ), url( - r'^multiple/edit/$', DocumentMetadataEditView.as_view(), + regex=r'^multiple/edit/$', view=DocumentMetadataEditView.as_view(), name='metadata_multiple_edit' ), url( - r'^(?P\d+)/view/$', DocumentMetadataListView.as_view(), + regex=r'^(?P\d+)/view/$', view=DocumentMetadataListView.as_view(), name='metadata_view' ), url( - r'^(?P\d+)/add/$', DocumentMetadataAddView.as_view(), + regex=r'^(?P\d+)/add/$', view=DocumentMetadataAddView.as_view(), name='metadata_add' ), url( - r'^multiple/add/$', DocumentMetadataAddView.as_view(), + regex=r'^multiple/add/$', view=DocumentMetadataAddView.as_view(), name='metadata_multiple_add' ), url( - r'^(?P\d+)/remove/$', DocumentMetadataRemoveView.as_view(), - name='metadata_remove' + regex=r'^(?P\d+)/remove/$', + view=DocumentMetadataRemoveView.as_view(), name='metadata_remove' ), url( - r'^multiple/remove/$', DocumentMetadataRemoveView.as_view(), + regex=r'^multiple/remove/$', view=DocumentMetadataRemoveView.as_view(), name='metadata_multiple_remove' ), - url( - r'^setup/type/list/$', MetadataTypeListView.as_view(), + regex=r'^setup/type/list/$', view=MetadataTypeListView.as_view(), name='setup_metadata_type_list' ), url( - r'^setup/type/create/$', MetadataTypeCreateView.as_view(), + regex=r'^setup/type/create/$', view=MetadataTypeCreateView.as_view(), name='setup_metadata_type_create' ), url( - r'^setup/type/(?P\d+)/edit/$', MetadataTypeEditView.as_view(), - name='setup_metadata_type_edit' + regex=r'^setup/type/(?P\d+)/edit/$', + view=MetadataTypeEditView.as_view(), name='setup_metadata_type_edit' ), url( - r'^setup/type/(?P\d+)/delete/$', - MetadataTypeDeleteView.as_view(), name='setup_metadata_type_delete' + regex=r'^setup/type/(?P\d+)/delete/$', + view=MetadataTypeDeleteView.as_view(), name='setup_metadata_type_delete' ), url( - r'^setup/document_types/(?P\d+)/metadata_types/$', - SetupDocumentTypeMetadataTypes.as_view(), + regex=r'^setup/document_types/(?P\d+)/metadata_types/$', + view=SetupDocumentTypeMetadataTypes.as_view(), name='setup_document_type_metadata_types' ), url( - r'^setup/metadata_types/(?P\d+)/document_types/$', - SetupMetadataTypesDocumentTypes.as_view(), + regex=r'^setup/metadata_types/(?P\d+)/document_types/$', + view=SetupMetadataTypesDocumentTypes.as_view(), name='setup_metadata_type_document_types' ), ] api_urls = [ url( - r'^metadata_types/$', APIMetadataTypeListView.as_view(), + regex=r'^metadata_types/$', view=APIMetadataTypeListView.as_view(), name='metadatatype-list' ), url( - r'^metadata_types/(?P\d+)/$', - APIMetadataTypeView.as_view(), name='metadatatype-detail' + regex=r'^metadata_types/(?P\d+)/$', + view=APIMetadataTypeView.as_view(), name='metadatatype-detail' ), url( - r'^document_types/(?P\d+)/metadata_types/$', - APIDocumentTypeMetadataTypeListView.as_view(), + regex=r'^document_types/(?P\d+)/metadata_types/$', + view=APIDocumentTypeMetadataTypeListView.as_view(), name='documenttypemetadatatype-list' ), url( - r'^document_types/(?P\d+)/metadata_types/(?P\d+)/$', - APIDocumentTypeMetadataTypeView.as_view(), + regex=r'^document_types/(?P\d+)/metadata_types/(?P\d+)/$', + view=APIDocumentTypeMetadataTypeView.as_view(), name='documenttypemetadatatype-detail' ), url( - r'^documents/(?P\d+)/metadata/$', - APIDocumentMetadataListView.as_view(), name='documentmetadata-list' + regex=r'^documents/(?P\d+)/metadata/$', + view=APIDocumentMetadataListView.as_view(), name='documentmetadata-list' ), url( - r'^documents/(?P\d+)/metadata/(?P\d+)/$', - APIDocumentMetadataView.as_view(), name='documentmetadata-detail' + regex=r'^documents/(?P\d+)/metadata/(?P\d+)/$', + view=APIDocumentMetadataView.as_view(), name='documentmetadata-detail' ), ] diff --git a/mayan/apps/motd/urls.py b/mayan/apps/motd/urls.py index 7ee0ff1740..f1d4dae73e 100644 --- a/mayan/apps/motd/urls.py +++ b/mayan/apps/motd/urls.py @@ -8,21 +8,28 @@ from .views import ( ) urlpatterns = [ - url(r'^list/$', MessageListView.as_view(), name='message_list'), - url(r'^create/$', MessageCreateView.as_view(), name='message_create'), + url(regex=r'^list/$', view=MessageListView.as_view(), name='message_list'), url( - r'^(?P\d+)/edit/$', MessageEditView.as_view(), name='message_edit' + regex=r'^create/$', view=MessageCreateView.as_view(), + name='message_create' ), url( - r'^(?P\d+)/delete/$', MessageDeleteView.as_view(), + regex=r'^(?P\d+)/edit/$', view=MessageEditView.as_view(), + name='message_edit' + ), + url( + regex=r'^(?P\d+)/delete/$', view=MessageDeleteView.as_view(), name='message_delete' ), ] api_urls = [ - url(r'^messages/$', APIMessageListView.as_view(), name='message-list'), url( - r'^messages/(?P[0-9]+)/$', APIMessageView.as_view(), + regex=r'^messages/$', view=APIMessageListView.as_view(), + name='message-list' + ), + url( + regex=r'^messages/(?P[0-9]+)/$', view=APIMessageView.as_view(), name='message-detail' ), ] diff --git a/mayan/apps/ocr/urls.py b/mayan/apps/ocr/urls.py index 6ae236f16e..a56543baba 100644 --- a/mayan/apps/ocr/urls.py +++ b/mayan/apps/ocr/urls.py @@ -14,54 +14,56 @@ from .views import ( urlpatterns = [ url( - r'^documents/pages/(?P\d+)/content/$', - DocumentPageOCRContentView.as_view(), name='document_page_ocr_content' + regex=r'^documents/pages/(?P\d+)/content/$', + view=DocumentPageOCRContentView.as_view(), + name='document_page_ocr_content' ), url( - r'^documents/(?P\d+)/content/$', DocumentOCRContentView.as_view(), - name='document_ocr_content' + regex=r'^documents/(?P\d+)/content/$', + view=DocumentOCRContentView.as_view(), name='document_ocr_content' ), url( - r'^documents/(?P\d+)/submit/$', DocumentSubmitView.as_view(), - name='document_submit' + regex=r'^documents/(?P\d+)/submit/$', + view=DocumentSubmitView.as_view(), name='document_submit' ), url( - r'^document_types/submit/$', DocumentTypeSubmitView.as_view(), - name='document_type_submit' + regex=r'^document_types/submit/$', + view=DocumentTypeSubmitView.as_view(), name='document_type_submit' ), url( - r'^documents/multiple/submit/$', DocumentSubmitView.as_view(), - name='document_submit_multiple' + regex=r'^documents/multiple/submit/$', + view=DocumentSubmitView.as_view(), name='document_submit_multiple' ), url( - r'^document_types/(?P\d+)/ocr/settings/$', - DocumentTypeSettingsEditView.as_view(), + regex=r'^document_types/(?P\d+)/ocr/settings/$', + view=DocumentTypeSettingsEditView.as_view(), name='document_type_ocr_settings' ), url( - r'^documents/(?P\d+)/ocr/errors/$', - DocumentOCRErrorsListView.as_view(), name='document_ocr_error_list' + regex=r'^documents/(?P\d+)/ocr/errors/$', + view=DocumentOCRErrorsListView.as_view(), + name='document_ocr_error_list' ), url( - r'^documents/(?P\d+)/ocr/download/$', - DocumentOCRDownloadView.as_view(), name='document_ocr_download' + regex=r'^documents/(?P\d+)/ocr/download/$', + view=DocumentOCRDownloadView.as_view(), name='document_ocr_download' ), - url(r'^all/$', EntryListView.as_view(), name='entry_list'), + url(regex=r'^all/$', view=EntryListView.as_view(), name='entry_list'), ] api_urls = [ url( - r'^documents/(?P\d+)/submit/$', APIDocumentOCRView.as_view(), - name='document-ocr-submit-view' + regex=r'^documents/(?P\d+)/submit/$', + view=APIDocumentOCRView.as_view(), name='document-ocr-submit-view' ), url( - r'^documents/(?P\d+)/versions/(?P\d+)/ocr/$', - APIDocumentVersionOCRView.as_view(), + regex=r'^documents/(?P\d+)/versions/(?P\d+)/ocr/$', + view=APIDocumentVersionOCRView.as_view(), name='document-version-ocr-submit-view' ), url( - r'^documents/(?P\d+)/versions/(?P\d+)/pages/(?P\d+)/ocr/$', - APIDocumentPageOCRContentView.as_view(), + regex=r'^documents/(?P\d+)/versions/(?P\d+)/pages/(?P\d+)/ocr/$', + view=APIDocumentPageOCRContentView.as_view(), name='document-page-ocr-content-view' ), ] diff --git a/mayan/apps/permissions/urls.py b/mayan/apps/permissions/urls.py index 3c620c2059..6bd5f52a16 100644 --- a/mayan/apps/permissions/urls.py +++ b/mayan/apps/permissions/urls.py @@ -10,28 +10,40 @@ from .views import ( urlpatterns = [ url( - r'^group/(?P\d+)/roles/$', GroupRoleMembersView.as_view(), - name='group_roles' + regex=r'^group/(?P\d+)/roles/$', + view=GroupRoleMembersView.as_view(), name='group_roles' ), - url(r'^role/list/$', RoleListView.as_view(), name='role_list'), - url(r'^role/create/$', RoleCreateView.as_view(), name='role_create'), + url(regex=r'^role/list/$', view=RoleListView.as_view(), name='role_list'), url( - r'^role/(?P\d+)/permissions/$', SetupRolePermissionsView.as_view(), - name='role_permissions' + regex=r'^role/create/$', view=RoleCreateView.as_view(), + name='role_create' ), - url(r'^role/(?P\d+)/edit/$', RoleEditView.as_view(), name='role_edit'), url( - r'^role/(?P\d+)/delete/$', RoleDeleteView.as_view(), + regex=r'^role/(?P\d+)/permissions/$', + view=SetupRolePermissionsView.as_view(), name='role_permissions' + ), + url( + regex=r'^role/(?P\d+)/edit/$', view=RoleEditView.as_view(), + name='role_edit' + ), + url( + regex=r'^role/(?P\d+)/delete/$', view=RoleDeleteView.as_view(), name='role_delete' ), url( - r'^role/(?P\d+)/groups/$', SetupRoleMembersView.as_view(), - name='role_groups' + regex=r'^role/(?P\d+)/groups/$', + view=SetupRoleMembersView.as_view(), name='role_groups' ), ] api_urls = [ - url(r'^permissions/$', APIPermissionList.as_view(), name='permission-list'), - url(r'^roles/$', APIRoleListView.as_view(), name='role-list'), - url(r'^roles/(?P[0-9]+)/$', APIRoleView.as_view(), name='role-detail'), + url( + regex=r'^permissions/$', view=APIPermissionList.as_view(), + name='permission-list' + ), + url(regex=r'^roles/$', view=APIRoleListView.as_view(), name='role-list'), + url( + regex=r'^roles/(?P[0-9]+)/$', view=APIRoleView.as_view(), + name='role-detail' + ), ] diff --git a/mayan/apps/rest_api/urls.py b/mayan/apps/rest_api/urls.py index eac7976458..cf8f278699 100644 --- a/mayan/apps/rest_api/urls.py +++ b/mayan/apps/rest_api/urls.py @@ -6,9 +6,9 @@ from .api_views import APIRoot, BrowseableObtainAuthToken, schema_view api_urls = [ - url(r'^$', APIRoot.as_view(), name='api_root'), + url(regex=r'^$', view=APIRoot.as_view(), name='api_root'), url( - r'^auth/token/obtain/$', BrowseableObtainAuthToken.as_view(), + regex=r'^auth/token/obtain/$', view=BrowseableObtainAuthToken.as_view(), name='auth_token_obtain' ), ] @@ -30,5 +30,5 @@ urlpatterns = [ regex=r'^redoc/$', name='schema-redoc', view=schema_view.with_ui('redoc', cache_timeout=None) ), - url(r'^', include(api_urls)), + url(regex=r'^', view=include(api_urls)), ] diff --git a/mayan/apps/smart_settings/urls.py b/mayan/apps/smart_settings/urls.py index 7e108ac756..5640901c1a 100644 --- a/mayan/apps/smart_settings/urls.py +++ b/mayan/apps/smart_settings/urls.py @@ -6,15 +6,15 @@ from .views import NamespaceDetailView, NamespaceListView, SettingEditView urlpatterns = [ url( - r'^namespace/all/$', NamespaceListView.as_view(), + regex=r'^namespace/all/$', view=NamespaceListView.as_view(), name='namespace_list' ), url( - r'^namespace/(?P\w+)/$', - NamespaceDetailView.as_view(), name='namespace_detail' + regex=r'^namespace/(?P\w+)/$', + view=NamespaceDetailView.as_view(), name='namespace_detail' ), url( - r'^edit/(?P\w+)/$', - SettingEditView.as_view(), name='setting_edit_view' + regex=r'^edit/(?P\w+)/$', + view=SettingEditView.as_view(), name='setting_edit_view' ), ] diff --git a/mayan/apps/sources/urls.py b/mayan/apps/sources/urls.py index 01f41a7b68..8796f632df 100644 --- a/mayan/apps/sources/urls.py +++ b/mayan/apps/sources/urls.py @@ -15,79 +15,77 @@ from .wizards import DocumentCreateWizard urlpatterns = [ url( - r'^staging_file/(?P\d+)/(?P.+)/delete/$', - StagingFileDeleteView.as_view(), name='staging_file_delete' - ), - - url( - r'^upload/document/new/interactive/(?P\d+)/$', - UploadInteractiveView.as_view(), name='upload_interactive' + regex=r'^staging_file/(?P\d+)/(?P.+)/delete/$', + view=StagingFileDeleteView.as_view(), name='staging_file_delete' ), url( - r'^upload/document/new/interactive/$', UploadInteractiveView.as_view(), - name='upload_interactive' - ), - - url( - r'^upload/document/(?P\d+)/version/interactive/(?P\d+)/$', - UploadInteractiveVersionView.as_view(), name='upload_version' + regex=r'^upload/document/new/interactive/(?P\d+)/$', + view=UploadInteractiveView.as_view(), name='upload_interactive' ), url( - r'^upload/document/(?P\d+)/version/interactive/$', - UploadInteractiveVersionView.as_view(), name='upload_version' + regex=r'^upload/document/new/interactive/$', + view=UploadInteractiveView.as_view(), name='upload_interactive' + ), + url( + regex=r'^upload/document/(?P\d+)/version/interactive/(?P\d+)/$', + view=UploadInteractiveVersionView.as_view(), name='upload_version' + ), + url( + regex=r'^upload/document/(?P\d+)/version/interactive/$', + view=UploadInteractiveVersionView.as_view(), name='upload_version' ), # Setup views url( - r'^setup/list/$', SetupSourceListView.as_view(), + regex=r'^setup/list/$', view=SetupSourceListView.as_view(), name='setup_source_list' ), url( - r'^setup/(?P\d+)/edit/$', SetupSourceEditView.as_view(), + regex=r'^setup/(?P\d+)/edit/$', view=SetupSourceEditView.as_view(), name='setup_source_edit' ), url( - r'^setup/(?P\d+)/logs/$', SourceLogListView.as_view(), + regex=r'^setup/(?P\d+)/logs/$', view=SourceLogListView.as_view(), name='setup_source_logs' ), url( - r'^setup/(?P\d+)/delete/$', SetupSourceDeleteView.as_view(), - name='setup_source_delete' + regex=r'^setup/(?P\d+)/delete/$', + view=SetupSourceDeleteView.as_view(), name='setup_source_delete' ), url( - r'^setup/(?P\w+)/create/$', - SetupSourceCreateView.as_view(), name='setup_source_create' + regex=r'^setup/(?P\w+)/create/$', + view=SetupSourceCreateView.as_view(), name='setup_source_create' ), url( - r'^setup/(?P\d+)/check/$', SetupSourceCheckView.as_view(), - name='setup_source_check' + regex=r'^setup/(?P\d+)/check/$', + view=SetupSourceCheckView.as_view(), name='setup_source_check' ), # Document create views url( - r'^create/from/local/multiple/$', DocumentCreateWizard.as_view(), - name='document_create_multiple' + regex=r'^create/from/local/multiple/$', + view=DocumentCreateWizard.as_view(), name='document_create_multiple' ), ] api_urls = [ url( - r'^staging_folders/file/(?P[0-9]+)/(?P.+)/image/$', - APIStagingSourceFileImageView.as_view(), + regex=r'^staging_folders/file/(?P[0-9]+)/(?P.+)/image/$', + view=APIStagingSourceFileImageView.as_view(), name='stagingfolderfile-image-view' ), url( - r'^staging_folders/file/(?P[0-9]+)/(?P.+)/$', - APIStagingSourceFileView.as_view(), name='stagingfolderfile-detail' + regex=r'^staging_folders/file/(?P[0-9]+)/(?P.+)/$', + view=APIStagingSourceFileView.as_view(), name='stagingfolderfile-detail' ), url( - r'^staging_folders/$', APIStagingSourceListView.as_view(), + regex=r'^staging_folders/$', view=APIStagingSourceListView.as_view(), name='stagingfolder-list' ), url( - r'^staging_folders/(?P[0-9]+)/$', APIStagingSourceView.as_view(), - name='stagingfolder-detail' + regex=r'^staging_folders/(?P[0-9]+)/$', + view=APIStagingSourceView.as_view(), name='stagingfolder-detail' ) ] diff --git a/mayan/apps/tags/urls.py b/mayan/apps/tags/urls.py index c477e49756..c254433884 100644 --- a/mayan/apps/tags/urls.py +++ b/mayan/apps/tags/urls.py @@ -13,61 +13,64 @@ from .views import ( ) urlpatterns = [ - url(r'^list/$', TagListView.as_view(), name='tag_list'), - url(r'^create/$', TagCreateView.as_view(), name='tag_create'), + url(regex=r'^list/$', view=TagListView.as_view(), name='tag_list'), + url(regex=r'^create/$', view=TagCreateView.as_view(), name='tag_create'), url( - r'^(?P\d+)/delete/$', TagDeleteActionView.as_view(), + regex=r'^(?P\d+)/delete/$', view=TagDeleteActionView.as_view(), name='tag_delete' ), - url(r'^(?P\d+)/edit/$', TagEditView.as_view(), name='tag_edit'), url( - r'^(?P\d+)/documents/$', TagTaggedItemListView.as_view(), + regex=r'^(?P\d+)/edit/$', view=TagEditView.as_view(), + name='tag_edit' + ), + url( + regex=r'^(?P\d+)/documents/$', view=TagTaggedItemListView.as_view(), name='tag_tagged_item_list' ), url( - r'^multiple/delete/$', TagDeleteActionView.as_view(), + regex=r'^multiple/delete/$', view=TagDeleteActionView.as_view(), name='tag_multiple_delete' ), - url( - r'^multiple/remove/document/(?P\d+)/$', - TagRemoveActionView.as_view(), + regex=r'^multiple/remove/document/(?P\d+)/$', + view=TagRemoveActionView.as_view(), name='single_document_multiple_tag_remove' ), url( - r'^multiple/remove/document/multiple/$', - TagRemoveActionView.as_view(), + regex=r'^multiple/remove/document/multiple/$', + view=TagRemoveActionView.as_view(), name='multiple_documents_selection_tag_remove' ), - url( - r'^selection/attach/document/(?P\d+)/$', - TagAttachActionView.as_view(), name='tag_attach' + regex=r'^selection/attach/document/(?P\d+)/$', + view=TagAttachActionView.as_view(), name='tag_attach' ), url( - r'^selection/attach/document/multiple/$', - TagAttachActionView.as_view(), name='multiple_documents_tag_attach' + regex=r'^selection/attach/document/multiple/$', + view=TagAttachActionView.as_view(), name='multiple_documents_tag_attach' ), - url( - r'^document/(?P\d+)/tags/$', DocumentTagListView.as_view(), - name='document_tags' + regex=r'^document/(?P\d+)/tags/$', + view=DocumentTagListView.as_view(), name='document_tags' ), ] api_urls = [ url( - r'^tags/(?P[0-9]+)/documents/$', APITagDocumentListView.as_view(), - name='tag-document-list' - ), - url(r'^tags/(?P[0-9]+)/$', APITagView.as_view(), name='tag-detail'), - url(r'^tags/$', APITagListView.as_view(), name='tag-list'), - url( - r'^documents/(?P[0-9]+)/tags/$', - APIDocumentTagListView.as_view(), name='document-tag-list' + regex=r'^tags/(?P[0-9]+)/documents/$', + view=APITagDocumentListView.as_view(), name='tag-document-list' ), url( - r'^documents/(?P[0-9]+)/tags/(?P[0-9]+)/$', - APIDocumentTagView.as_view(), name='document-tag-detail' + regex=r'^tags/(?P[0-9]+)/$', view=APITagView.as_view(), + name='tag-detail' + ), + url(regex=r'^tags/$', view=APITagListView.as_view(), name='tag-list'), + url( + regex=r'^documents/(?P[0-9]+)/tags/$', + view=APIDocumentTagListView.as_view(), name='document-tag-list' + ), + url( + regex=r'^documents/(?P[0-9]+)/tags/(?P[0-9]+)/$', + view=APIDocumentTagView.as_view(), name='document-tag-detail' ), ] diff --git a/mayan/apps/task_manager/urls.py b/mayan/apps/task_manager/urls.py index 645ad90934..de48bf12ff 100644 --- a/mayan/apps/task_manager/urls.py +++ b/mayan/apps/task_manager/urls.py @@ -10,19 +10,21 @@ from .views import ( urlpatterns = [ url( - r'^queues/$', QueueListView.as_view(), + regex=r'^queues/$', view=QueueListView.as_view(), name='queue_list' ), url( - r'^queues/(?P[-\w]+)/tasks/active/$', - QueueActiveTaskListView.as_view(), name='queue_active_task_list' + regex=r'^queues/(?P[-\w]+)/tasks/active/$', + view=QueueActiveTaskListView.as_view(), name='queue_active_task_list' ), url( - r'^queues/(?P[-\w]+)/tasks/scheduled/$', - QueueScheduledTaskListView.as_view(), name='queue_scheduled_task_list' + regex=r'^queues/(?P[-\w]+)/tasks/scheduled/$', + view=QueueScheduledTaskListView.as_view(), + name='queue_scheduled_task_list' ), url( - r'^queues/(?P[-\w]+)/tasks/reserved/$', - QueueReservedTaskListView.as_view(), name='queue_reserved_task_list' + regex=r'^queues/(?P[-\w]+)/tasks/reserved/$', + view=QueueReservedTaskListView.as_view(), + name='queue_reserved_task_list' ), ] diff --git a/mayan/apps/user_management/urls.py b/mayan/apps/user_management/urls.py index ca47b5d69b..11afa94660 100644 --- a/mayan/apps/user_management/urls.py +++ b/mayan/apps/user_management/urls.py @@ -13,64 +13,78 @@ from .views import ( ) urlpatterns = [ - url(r'^group/list/$', GroupListView.as_view(), name='group_list'), - url(r'^group/create/$', GroupCreateView.as_view(), name='group_create'), url( - r'^group/(?P\d+)/edit/$', GroupEditView.as_view(), + regex=r'^group/list/$', view=GroupListView.as_view(), name='group_list' + ), + url( + regex=r'^group/create/$', view=GroupCreateView.as_view(), + name='group_create' + ), + url( + regex=r'^group/(?P\d+)/edit/$', view=GroupEditView.as_view(), name='group_edit' ), url( - r'^group/(?P\d+)/delete/$', GroupDeleteView.as_view(), + regex=r'^group/(?P\d+)/delete/$', view=GroupDeleteView.as_view(), name='group_delete' ), url( - r'^group/(?P\d+)/members/$', GroupMembersView.as_view(), + regex=r'^group/(?P\d+)/members/$', view=GroupMembersView.as_view(), name='group_members' ), - url(r'^user/list/$', UserListView.as_view(), name='user_list'), - url(r'^user/create/$', UserCreateView.as_view(), name='user_create'), - url(r'^user/(?P\d+)/edit/$', UserEditView.as_view(), name='user_edit'), + url(regex=r'^user/list/$', view=UserListView.as_view(), name='user_list'), url( - r'^user/(?P\d+)/delete/$', UserDeleteView.as_view(), + regex=r'^user/create/$', view=UserCreateView.as_view(), + name='user_create' + ), + url( + regex=r'^user/(?P\d+)/edit/$', view=UserEditView.as_view(), + name='user_edit' + ), + url( + regex=r'^user/(?P\d+)/delete/$', view=UserDeleteView.as_view(), name='user_delete' ), url( - r'^user/multiple/delete/$', UserDeleteView.as_view(), + regex=r'^user/multiple/delete/$', view=UserDeleteView.as_view(), name='user_multiple_delete' ), url( - r'^user/(?P\d+)/set_password/$', UserSetPasswordView.as_view(), - name='user_set_password' + regex=r'^user/(?P\d+)/set_password/$', + view=UserSetPasswordView.as_view(), name='user_set_password' ), url( - r'^user/multiple/set_password/$', UserSetPasswordView.as_view(), - name='user_multiple_set_password' + regex=r'^user/multiple/set_password/$', + view=UserSetPasswordView.as_view(), name='user_multiple_set_password' ), url( - r'^user/(?P\d+)/groups/$', UserGroupsView.as_view(), + regex=r'^user/(?P\d+)/groups/$', view=UserGroupsView.as_view(), name='user_groups' ), url( - r'^user/(?P\d+)/options/$', - UserOptionsEditView.as_view(), - name='user_options' + regex=r'^user/(?P\d+)/options/$', + view=UserOptionsEditView.as_view(), name='user_options' ), ] api_urls = [ - url(r'^groups/$', APIGroupListView.as_view(), name='group-list'), + url(regex=r'^groups/$', view=APIGroupListView.as_view(), name='group-list'), url( - r'^groups/(?P[0-9]+)/$', APIGroupView.as_view(), + regex=r'^groups/(?P[0-9]+)/$', view=APIGroupView.as_view(), name='group-detail' ), - url(r'^users/$', APIUserListView.as_view(), name='user-list'), - url(r'^users/(?P[0-9]+)/$', APIUserView.as_view(), name='user-detail'), + url(regex=r'^users/$', view=APIUserListView.as_view(), name='user-list'), url( - r'^users/current/$', APICurrentUserView.as_view(), name='user-current' + regex=r'^users/(?P[0-9]+)/$', view=APIUserView.as_view(), + name='user-detail' ), url( - r'^users/(?P[0-9]+)/groups/$', APIUserGroupList.as_view(), - name='users-group-list' + regex=r'^users/current/$', view=APICurrentUserView.as_view(), + name='user-current' + ), + url( + regex=r'^users/(?P[0-9]+)/groups/$', + view=APIUserGroupList.as_view(), name='users-group-list' ), ] diff --git a/mayan/urls/base.py b/mayan/urls/base.py index b22478bb64..8266586b57 100644 --- a/mayan/urls/base.py +++ b/mayan/urls/base.py @@ -8,5 +8,5 @@ __all__ = ('urlpatterns',) admin.autodiscover() urlpatterns = [ - url(r'^admin/', admin.site.urls), + url(regex=r'^admin/', view=admin.site.urls), ] diff --git a/mayan/urls/development.py b/mayan/urls/development.py index 2cab9fec55..aa72c3b9eb 100644 --- a/mayan/urls/development.py +++ b/mayan/urls/development.py @@ -12,7 +12,7 @@ if 'rosetta' in settings.INSTALLED_APPS: pass else: urlpatterns += [ # NOQA - url(r'^rosetta/', include('rosetta.urls'), name='rosetta') + url(regex=r'^rosetta/', view=include('rosetta.urls'), name='rosetta') ] if 'debug_toolbar' in settings.INSTALLED_APPS: @@ -22,5 +22,5 @@ if 'debug_toolbar' in settings.INSTALLED_APPS: pass else: urlpatterns += [ # NOQA - url(r'^__debug__/', include(debug_toolbar.urls)) + url(regex=r'^__debug__/', view=include(debug_toolbar.urls)) ]