diff --git a/mayan/apps/acls/urls.py b/mayan/apps/acls/urls.py index ba0652ae13..f3fa053817 100644 --- a/mayan/apps/acls/urls.py +++ b/mayan/apps/acls/urls.py @@ -4,19 +4,19 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'acls.views', - url(r'^new_holder_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', 'acl_new_holder_for', (), 'acl_new_holder_for'), - url(r'^list_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', 'acl_list', (), 'acl_list'), - url(r'^details/(?P[.\w]+)/holder/(?P[.\w]+)/$', 'acl_detail', (), 'acl_detail'), - url(r'^holder/new/(?P[.\w]+)/$', 'acl_holder_new', (), 'acl_holder_new'), + url(r'^new_holder_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', 'acl_new_holder_for', name='acl_new_holder_for'), + url(r'^list_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', 'acl_list', name='acl_list'), + url(r'^details/(?P[.\w]+)/holder/(?P[.\w]+)/$', 'acl_detail', name='acl_detail'), + url(r'^holder/new/(?P[.\w]+)/$', 'acl_holder_new', name='acl_holder_new'), - url(r'^multiple/grant/$', 'acl_grant', (), 'acl_multiple_grant'), - url(r'^multiple/revoke/$', 'acl_revoke', (), 'acl_multiple_revoke'), + url(r'^multiple/grant/$', 'acl_grant', name='acl_multiple_grant'), + url(r'^multiple/revoke/$', 'acl_revoke', name='acl_multiple_revoke'), - url(r'^class/$', 'acl_setup_valid_classes', (), 'acl_setup_valid_classes'), - url(r'^class/details/(?P[.\w]+)/holder/(?P[.\w]+)/$', 'acl_class_acl_detail', (), 'acl_class_acl_detail'), - url(r'^class/list_for/(?P[.\w]+)/$', 'acl_class_acl_list', (), 'acl_class_acl_list'), - url(r'^class/holder/new/(?P[.\w]+)/$', 'acl_class_new_holder_for', (), 'acl_class_new_holder_for'), + url(r'^class/$', 'acl_setup_valid_classes', name='acl_setup_valid_classes'), + url(r'^class/details/(?P[.\w]+)/holder/(?P[.\w]+)/$', 'acl_class_acl_detail', name='acl_class_acl_detail'), + url(r'^class/list_for/(?P[.\w]+)/$', 'acl_class_acl_list', name='acl_class_acl_list'), + url(r'^class/holder/new/(?P[.\w]+)/$', 'acl_class_new_holder_for', name='acl_class_new_holder_for'), - url(r'^class/multiple/grant/$', 'acl_class_multiple_grant', (), 'acl_class_multiple_grant'), - url(r'^class/multiple/revoke/$', 'acl_class_multiple_revoke', (), 'acl_class_multiple_revoke'), + url(r'^class/multiple/grant/$', 'acl_class_multiple_grant', name='acl_class_multiple_grant'), + url(r'^class/multiple/revoke/$', 'acl_class_multiple_revoke', name='acl_class_multiple_revoke'), ) diff --git a/mayan/apps/converter/urls.py b/mayan/apps/converter/urls.py index 60af32b529..195656d0d1 100644 --- a/mayan/apps/converter/urls.py +++ b/mayan/apps/converter/urls.py @@ -4,8 +4,8 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'converter.views', - url(r'^create_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', 'transformation_create', (), 'transformation_create'), - url(r'^list_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', 'transformation_list', (), 'transformation_list'), - url(r'^delete/(?P\d+)/$', 'transformation_delete', (), 'transformation_delete'), - url(r'^edit/(?P\d+)/$', 'transformation_edit', (), 'transformation_edit'), + url(r'^create_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', 'transformation_create', name='transformation_create'), + url(r'^list_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', 'transformation_list', name='transformation_list'), + url(r'^delete/(?P\d+)/$', 'transformation_delete', name='transformation_delete'), + url(r'^edit/(?P\d+)/$', 'transformation_edit', name='transformation_edit'), ) diff --git a/mayan/apps/django_gpg/urls.py b/mayan/apps/django_gpg/urls.py index dc172041a4..39ed308180 100644 --- a/mayan/apps/django_gpg/urls.py +++ b/mayan/apps/django_gpg/urls.py @@ -2,9 +2,9 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'django_gpg.views', - url(r'^delete/(?P.+)/(?P\w+)/$', 'key_delete', (), 'key_delete'), + url(r'^delete/(?P.+)/(?P\w+)/$', 'key_delete', name='key_delete'), url(r'^list/private/$', 'key_list', {'secret': True}, 'key_private_list'), url(r'^list/public/$', 'key_list', {'secret': False}, 'key_public_list'), - url(r'^query/$', 'key_query', (), 'key_query'), - url(r'^receive/(?P.+)/$', 'key_receive', (), 'key_receive'), + url(r'^query/$', 'key_query', name='key_query'), + url(r'^receive/(?P.+)/$', 'key_receive', name='key_receive'), ) diff --git a/mayan/apps/document_comments/urls.py b/mayan/apps/document_comments/urls.py index 2d2f2cae2f..188ca85d72 100644 --- a/mayan/apps/document_comments/urls.py +++ b/mayan/apps/document_comments/urls.py @@ -4,8 +4,8 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'document_comments.views', - url(r'^comment/(?P\d+)/delete/$', 'comment_delete', (), 'comment_delete'), - url(r'^comment/multiple/delete/$', 'comment_multiple_delete', (), 'comment_multiple_delete'), - url(r'^(?P\d+)/comment/add/$', 'comment_add', (), 'comment_add'), - url(r'^(?P\d+)/comment/list/$', 'comments_for_document', (), 'comments_for_document'), + url(r'^comment/(?P\d+)/delete/$', 'comment_delete', name='comment_delete'), + url(r'^comment/multiple/delete/$', 'comment_multiple_delete', name='comment_multiple_delete'), + url(r'^(?P\d+)/comment/add/$', 'comment_add', name='comment_add'), + url(r'^(?P\d+)/comment/list/$', 'comments_for_document', name='comments_for_document'), ) diff --git a/mayan/apps/document_indexing/urls.py b/mayan/apps/document_indexing/urls.py index 8b10297642..bf4e4a4839 100644 --- a/mayan/apps/document_indexing/urls.py +++ b/mayan/apps/document_indexing/urls.py @@ -12,22 +12,22 @@ from .views import SetupIndexDocumentTypesView urlpatterns = patterns( 'document_indexing.views', - url(r'^setup/index/list/$', 'index_setup_list', (), 'index_setup_list'), - url(r'^setup/index/create/$', 'index_setup_create', (), 'index_setup_create'), - url(r'^setup/index/(?P\d+)/edit/$', 'index_setup_edit', (), 'index_setup_edit'), - url(r'^setup/index/(?P\d+)/delete/$', 'index_setup_delete', (), 'index_setup_delete'), - url(r'^setup/index/(?P\d+)/view/$', 'index_setup_view', (), 'index_setup_view'), + url(r'^setup/index/list/$', 'index_setup_list', name='index_setup_list'), + url(r'^setup/index/create/$', 'index_setup_create', name='index_setup_create'), + url(r'^setup/index/(?P\d+)/edit/$', 'index_setup_edit', name='index_setup_edit'), + url(r'^setup/index/(?P\d+)/delete/$', 'index_setup_delete', name='index_setup_delete'), + url(r'^setup/index/(?P\d+)/view/$', 'index_setup_view', name='index_setup_view'), url(r'^setup/index/(?P\d+)/document_types/$', SetupIndexDocumentTypesView.as_view(), name='index_setup_document_types'), - url(r'^setup/template/node/(?P\d+)/create/child/$', 'template_node_create', (), 'template_node_create'), - url(r'^setup/template/node/(?P\d+)/edit/$', 'template_node_edit', (), 'template_node_edit'), - url(r'^setup/template/node/(?P\d+)/delete/$', 'template_node_delete', (), 'template_node_delete'), + url(r'^setup/template/node/(?P\d+)/create/child/$', 'template_node_create', name='template_node_create'), + url(r'^setup/template/node/(?P\d+)/edit/$', 'template_node_edit', name='template_node_edit'), + url(r'^setup/template/node/(?P\d+)/delete/$', 'template_node_delete', name='template_node_delete'), - url(r'^index/list/$', 'index_list', (), 'index_list'), - url(r'^instance/node/(?P\d+)/$', 'index_instance_node_view', (), 'index_instance_node_view'), + url(r'^index/list/$', 'index_list', name='index_list'), + url(r'^instance/node/(?P\d+)/$', 'index_instance_node_view', name='index_instance_node_view'), - url(r'^rebuild/all/$', 'rebuild_index_instances', (), 'rebuild_index_instances'), - url(r'^list/for/document/(?P\d+)/$', 'document_index_list', (), 'document_index_list'), + url(r'^rebuild/all/$', 'rebuild_index_instances', name='rebuild_index_instances'), + url(r'^list/for/document/(?P\d+)/$', 'document_index_list', name='document_index_list'), ) api_urls = patterns( diff --git a/mayan/apps/document_signatures/urls.py b/mayan/apps/document_signatures/urls.py index 3651d40107..f2b4e0c87d 100644 --- a/mayan/apps/document_signatures/urls.py +++ b/mayan/apps/document_signatures/urls.py @@ -4,8 +4,8 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'document_signatures.views', - url(r'^verify/(?P\d+)/$', 'document_verify', (), 'document_verify'), - url(r'^upload/signature/(?P\d+)/$', 'document_signature_upload', (), 'document_signature_upload'), - url(r'^download/signature/(?P\d+)/$', 'document_signature_download', (), 'document_signature_download'), - url(r'^document/(?P\d+)/signature/delete/$', 'document_signature_delete', (), 'document_signature_delete'), + url(r'^verify/(?P\d+)/$', 'document_verify', name='document_verify'), + url(r'^upload/signature/(?P\d+)/$', 'document_signature_upload', name='document_signature_upload'), + url(r'^download/signature/(?P\d+)/$', 'document_signature_download', name='document_signature_download'), + url(r'^document/(?P\d+)/signature/delete/$', 'document_signature_delete', name='document_signature_delete'), ) diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py index 1aa185d5bb..06a0006ca9 100644 --- a/mayan/apps/documents/urls.py +++ b/mayan/apps/documents/urls.py @@ -19,58 +19,58 @@ urlpatterns = patterns( url(r'^list/$', DocumentListView.as_view(), name='document_list'), url(r'^list/recent/$', RecentDocumentListView.as_view(), name='document_list_recent'), - url(r'^(?P\d+)/preview/$', 'document_preview', (), 'document_preview'), - url(r'^(?P\d+)/content/$', 'document_content', (), 'document_content'), - url(r'^(?P\d+)/properties/$', 'document_properties', (), 'document_properties'), + url(r'^(?P\d+)/preview/$', 'document_preview', name='document_preview'), + url(r'^(?P\d+)/content/$', 'document_content', name='document_content'), + url(r'^(?P\d+)/properties/$', 'document_properties', name='document_properties'), url(r'^(?P\d+)/type/$', 'document_document_type_edit', name='document_document_type_edit'), url(r'^multiple/type/$', 'document_multiple_document_type_edit', name='document_multiple_document_type_edit'), - url(r'^(?P\d+)/delete/$', 'document_delete', (), 'document_delete'), - url(r'^multiple/delete/$', 'document_multiple_delete', (), 'document_multiple_delete'), - url(r'^(?P\d+)/edit/$', 'document_edit', (), 'document_edit'), - url(r'^(?P\d+)/print/$', 'document_print', (), 'document_print'), - url(r'^(?P\d+)/reset_page_count/$', 'document_update_page_count', (), 'document_update_page_count'), - url(r'^multiple/reset_page_count/$', 'document_multiple_update_page_count', (), 'document_multiple_update_page_count'), + url(r'^(?P\d+)/delete/$', 'document_delete', name='document_delete'), + url(r'^multiple/delete/$', 'document_multiple_delete', name='document_multiple_delete'), + url(r'^(?P\d+)/edit/$', 'document_edit', name='document_edit'), + url(r'^(?P\d+)/print/$', 'document_print', name='document_print'), + url(r'^(?P\d+)/reset_page_count/$', 'document_update_page_count', name='document_update_page_count'), + url(r'^multiple/reset_page_count/$', 'document_multiple_update_page_count', name='document_multiple_update_page_count'), - url(r'^(?P\d+)/acls/$', 'document_acl_list', (), 'document_acl_list'), + url(r'^(?P\d+)/acls/$', 'document_acl_list', name='document_acl_list'), url(r'^(?P\d+)/display/$', 'get_document_image', {'size': DISPLAY_SIZE}, 'document_display'), url(r'^(?P\d+)/display/print/$', 'get_document_image', {'size': PRINT_SIZE}, 'document_display_print'), - url(r'^(?P\d+)/download/$', 'document_download', (), 'document_download'), - url(r'^multiple/download/$', 'document_multiple_download', (), 'document_multiple_download'), - url(r'^(?P\d+)/clear_transformations/$', 'document_clear_transformations', (), 'document_clear_transformations'), + url(r'^(?P\d+)/download/$', 'document_download', name='document_download'), + url(r'^multiple/download/$', 'document_multiple_download', name='document_multiple_download'), + url(r'^(?P\d+)/clear_transformations/$', 'document_clear_transformations', name='document_clear_transformations'), - url(r'^(?P\d+)/version/all/$', 'document_version_list', (), 'document_version_list'), - url(r'^document/version/(?P\d+)/download/$', 'document_download', (), 'document_version_download'), - url(r'^document/version/(?P\d+)/revert/$', 'document_version_revert', (), 'document_version_revert'), + url(r'^(?P\d+)/version/all/$', 'document_version_list', name='document_version_list'), + url(r'^document/version/(?P\d+)/download/$', 'document_download', name='document_version_download'), + url(r'^document/version/(?P\d+)/revert/$', 'document_version_revert', name='document_version_revert'), - url(r'^(?P\d+)/acls/$', 'document_acl_list', (), 'document_acl_list'), + url(r'^(?P\d+)/acls/$', 'document_acl_list', name='document_acl_list'), url(r'^(?P\d+)/pages/all/$', DocumentPageListView.as_view(), name='document_pages'), - url(r'^multiple/clear_transformations/$', 'document_multiple_clear_transformations', (), 'document_multiple_clear_transformations'), - url(r'^maintenance/clear_image_cache/$', 'document_clear_image_cache', (), 'document_clear_image_cache'), + url(r'^multiple/clear_transformations/$', 'document_multiple_clear_transformations', name='document_multiple_clear_transformations'), + url(r'^maintenance/clear_image_cache/$', 'document_clear_image_cache', name='document_clear_image_cache'), - url(r'^page/(?P\d+)/$', 'document_page_view', (), 'document_page_view'), - url(r'^page/(?P\d+)/navigation/next/$', 'document_page_navigation_next', (), 'document_page_navigation_next'), - url(r'^page/(?P\d+)/navigation/previous/$', 'document_page_navigation_previous', (), 'document_page_navigation_previous'), - url(r'^page/(?P\d+)/navigation/first/$', 'document_page_navigation_first', (), 'document_page_navigation_first'), - url(r'^page/(?P\d+)/navigation/last/$', 'document_page_navigation_last', (), 'document_page_navigation_last'), - url(r'^page/(?P\d+)/zoom/in/$', 'document_page_zoom_in', (), 'document_page_zoom_in'), - url(r'^page/(?P\d+)/zoom/out/$', 'document_page_zoom_out', (), 'document_page_zoom_out'), - url(r'^page/(?P\d+)/rotate/right/$', 'document_page_rotate_right', (), 'document_page_rotate_right'), - url(r'^page/(?P\d+)/rotate/left/$', 'document_page_rotate_left', (), 'document_page_rotate_left'), - url(r'^page/(?P\d+)/reset/$', 'document_page_view_reset', (), 'document_page_view_reset'), + url(r'^page/(?P\d+)/$', 'document_page_view', name='document_page_view'), + url(r'^page/(?P\d+)/navigation/next/$', 'document_page_navigation_next', name='document_page_navigation_next'), + url(r'^page/(?P\d+)/navigation/previous/$', 'document_page_navigation_previous', name='document_page_navigation_previous'), + url(r'^page/(?P\d+)/navigation/first/$', 'document_page_navigation_first', name='document_page_navigation_first'), + url(r'^page/(?P\d+)/navigation/last/$', 'document_page_navigation_last', name='document_page_navigation_last'), + url(r'^page/(?P\d+)/zoom/in/$', 'document_page_zoom_in', name='document_page_zoom_in'), + url(r'^page/(?P\d+)/zoom/out/$', 'document_page_zoom_out', name='document_page_zoom_out'), + url(r'^page/(?P\d+)/rotate/right/$', 'document_page_rotate_right', name='document_page_rotate_right'), + url(r'^page/(?P\d+)/rotate/left/$', 'document_page_rotate_left', name='document_page_rotate_left'), + url(r'^page/(?P\d+)/reset/$', 'document_page_view_reset', name='document_page_view_reset'), # Admin views - url(r'^type/list/$', 'document_type_list', (), 'document_type_list'), - url(r'^type/create/$', 'document_type_create', (), 'document_type_create'), - url(r'^type/(?P\d+)/edit/$', 'document_type_edit', (), 'document_type_edit'), - url(r'^type/(?P\d+)/delete/$', 'document_type_delete', (), 'document_type_delete'), + url(r'^type/list/$', 'document_type_list', name='document_type_list'), + url(r'^type/create/$', 'document_type_create', name='document_type_create'), + url(r'^type/(?P\d+)/edit/$', 'document_type_edit', name='document_type_edit'), + url(r'^type/(?P\d+)/delete/$', 'document_type_delete', name='document_type_delete'), - url(r'^type/(?P\d+)/filename/list/$', 'document_type_filename_list', (), 'document_type_filename_list'), - url(r'^type/filename/(?P\d+)/edit/$', 'document_type_filename_edit', (), 'document_type_filename_edit'), - url(r'^type/filename/(?P\d+)/delete/$', 'document_type_filename_delete', (), 'document_type_filename_delete'), - url(r'^type/(?P\d+)/filename/create/$', 'document_type_filename_create', (), 'document_type_filename_create'), + url(r'^type/(?P\d+)/filename/list/$', 'document_type_filename_list', name='document_type_filename_list'), + url(r'^type/filename/(?P\d+)/edit/$', 'document_type_filename_edit', name='document_type_filename_edit'), + url(r'^type/filename/(?P\d+)/delete/$', 'document_type_filename_delete', name='document_type_filename_delete'), + url(r'^type/(?P\d+)/filename/create/$', 'document_type_filename_create', name='document_type_filename_create'), ) api_urls = patterns( diff --git a/mayan/apps/dynamic_search/urls.py b/mayan/apps/dynamic_search/urls.py index 20ec32cb06..d0a7365294 100644 --- a/mayan/apps/dynamic_search/urls.py +++ b/mayan/apps/dynamic_search/urls.py @@ -8,10 +8,10 @@ from .api_views import ( urlpatterns = patterns( 'dynamic_search.views', - url(r'^$', 'search', (), 'search'), + url(r'^$', 'search', name='search'), url(r'^advanced/$', 'search', {'advanced': True}, 'search_advanced'), - url(r'^again/$', 'search_again', (), 'search_again'), - url(r'^results/$', 'results', (), 'results'), + url(r'^again/$', 'search_again', name='search_again'), + url(r'^results/$', 'results', name='results'), ) api_urls = patterns( diff --git a/mayan/apps/events/urls.py b/mayan/apps/events/urls.py index 0d0a13e2a2..820e84743b 100644 --- a/mayan/apps/events/urls.py +++ b/mayan/apps/events/urls.py @@ -4,7 +4,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'events.views', - url(r'^all/$', 'events_list', (), 'events_list'), - url(r'^for_object/(?P[\w\-]+)/(?P[\w\-]+)/(?P\d+)/$', 'events_list', (), 'events_for_object'), - url(r'^by_verb/(?P[\w\-]+)/$', 'events_list', (), 'events_by_verb'), + url(r'^all/$', 'events_list', name='events_list'), + url(r'^for_object/(?P[\w\-]+)/(?P[\w\-]+)/(?P\d+)/$', 'events_list', name='events_for_object'), + url(r'^by_verb/(?P[\w\-]+)/$', 'events_list', name='events_by_verb'), ) diff --git a/mayan/apps/folders/urls.py b/mayan/apps/folders/urls.py index 2aacaf5ead..ecca4caf2f 100644 --- a/mayan/apps/folders/urls.py +++ b/mayan/apps/folders/urls.py @@ -11,17 +11,17 @@ from .views import FolderDetailView, FolderListView urlpatterns = patterns( 'folders.views', url(r'^list/$', FolderListView.as_view(), name='folder_list'), - url(r'^create/$', 'folder_create', (), 'folder_create'), - url(r'^(?P\d+)/edit/$', 'folder_edit', (), 'folder_edit'), - url(r'^(?P\d+)/delete/$', 'folder_delete', (), 'folder_delete'), + url(r'^create/$', 'folder_create', name='folder_create'), + url(r'^(?P\d+)/edit/$', 'folder_edit', name='folder_edit'), + url(r'^(?P\d+)/delete/$', 'folder_delete', name='folder_delete'), url(r'^(?P\d+)/$', FolderDetailView.as_view(), name='folder_view'), - url(r'^(?P\d+)/remove/document/multiple/$', 'folder_document_multiple_remove', (), 'folder_document_multiple_remove'), + url(r'^(?P\d+)/remove/document/multiple/$', 'folder_document_multiple_remove', name='folder_document_multiple_remove'), - url(r'^document/(?P\d+)/folder/add/$', 'folder_add_document', (), 'folder_add_document'), - url(r'^document/multiple/folder/add/$', 'folder_add_multiple_documents', (), 'folder_add_multiple_documents'), - url(r'^document/(?P\d+)/folder/list/$', 'document_folder_list', (), 'document_folder_list'), + url(r'^document/(?P\d+)/folder/add/$', 'folder_add_document', name='folder_add_document'), + url(r'^document/multiple/folder/add/$', 'folder_add_multiple_documents', name='folder_add_multiple_documents'), + url(r'^document/(?P\d+)/folder/list/$', 'document_folder_list', name='document_folder_list'), - url(r'^(?P\d+)/acl/list/$', 'folder_acl_list', (), 'folder_acl_list'), + url(r'^(?P\d+)/acl/list/$', 'folder_acl_list', name='folder_acl_list'), ) api_urls = patterns( diff --git a/mayan/apps/installation/urls.py b/mayan/apps/installation/urls.py index 42b8faa471..a734970a5c 100644 --- a/mayan/apps/installation/urls.py +++ b/mayan/apps/installation/urls.py @@ -4,6 +4,6 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'installation.views', - url(r'^$', 'namespace_list', (), 'namespace_list'), - url(r'^(?P\w+)/details/$', 'namespace_details', (), 'namespace_details'), + url(r'^$', 'namespace_list', name='namespace_list'), + url(r'^(?P\w+)/details/$', 'namespace_details', name='namespace_details'), ) diff --git a/mayan/apps/linking/urls.py b/mayan/apps/linking/urls.py index 12f5c1d1b7..3281c80124 100644 --- a/mayan/apps/linking/urls.py +++ b/mayan/apps/linking/urls.py @@ -6,19 +6,19 @@ from .views import SetupSmartLinkDocumentTypesView urlpatterns = patterns( 'linking.views', - url(r'^document/(?P\d+)/$', 'smart_link_instances_for_document', (), 'smart_link_instances_for_document'), - url(r'^document/(?P\d+)/smart_link/(?P\d+)/$', 'smart_link_instance_view', (), 'smart_link_instance_view'), + url(r'^document/(?P\d+)/$', 'smart_link_instances_for_document', name='smart_link_instances_for_document'), + url(r'^document/(?P\d+)/smart_link/(?P\d+)/$', 'smart_link_instance_view', name='smart_link_instance_view'), - url(r'^setup/list/$', 'smart_link_list', (), 'smart_link_list'), - url(r'^setup/create/$', 'smart_link_create', (), 'smart_link_create'), - url(r'^setup/(?P\d+)/delete/$', 'smart_link_delete', (), 'smart_link_delete'), - url(r'^setup/(?P\d+)/edit/$', 'smart_link_edit', (), 'smart_link_edit'), + url(r'^setup/list/$', 'smart_link_list', name='smart_link_list'), + url(r'^setup/create/$', 'smart_link_create', name='smart_link_create'), + url(r'^setup/(?P\d+)/delete/$', 'smart_link_delete', name='smart_link_delete'), + url(r'^setup/(?P\d+)/edit/$', 'smart_link_edit', name='smart_link_edit'), url(r'^setup/(?P\d+)/document_types/$', SetupSmartLinkDocumentTypesView.as_view(), name='smart_link_document_types'), - url(r'^setup/(?P\d+)/condition/list/$', 'smart_link_condition_list', (), 'smart_link_condition_list'), - url(r'^setup/(?P\d+)/condition/create/$', 'smart_link_condition_create', (), 'smart_link_condition_create'), - url(r'^setup/smart_link/condition/(?P\d+)/edit/$', 'smart_link_condition_edit', (), 'smart_link_condition_edit'), - url(r'^setup/smart_link/condition/(?P\d+)/delete/$', 'smart_link_condition_delete', (), 'smart_link_condition_delete'), + url(r'^setup/(?P\d+)/condition/list/$', 'smart_link_condition_list', name='smart_link_condition_list'), + url(r'^setup/(?P\d+)/condition/create/$', 'smart_link_condition_create', name='smart_link_condition_create'), + url(r'^setup/smart_link/condition/(?P\d+)/edit/$', 'smart_link_condition_edit', name='smart_link_condition_edit'), + url(r'^setup/smart_link/condition/(?P\d+)/delete/$', 'smart_link_condition_delete', name='smart_link_condition_delete'), - url(r'^(?P\d+)/acl/list/$', 'smart_link_acl_list', (), 'smart_link_acl_list'), + url(r'^(?P\d+)/acl/list/$', 'smart_link_acl_list', name='smart_link_acl_list'), ) diff --git a/mayan/apps/mailer/urls.py b/mayan/apps/mailer/urls.py index 58beb532ed..3de1fa9b77 100644 --- a/mayan/apps/mailer/urls.py +++ b/mayan/apps/mailer/urls.py @@ -4,6 +4,6 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'mailer.views', - url(r'^(?P\d+)/send/link/$', 'send_document_link', (), 'send_document_link'), + url(r'^(?P\d+)/send/link/$', 'send_document_link', name='send_document_link'), url(r'^(?P\d+)/send/document/$', 'send_document_link', {'as_attachment': True}, 'send_document'), ) diff --git a/mayan/apps/metadata/urls.py b/mayan/apps/metadata/urls.py index c899c4e598..2efd3228c9 100644 --- a/mayan/apps/metadata/urls.py +++ b/mayan/apps/metadata/urls.py @@ -17,18 +17,18 @@ from .views import ( urlpatterns = patterns( 'metadata.views', - url(r'^(?P\d+)/edit/$', 'metadata_edit', (), 'metadata_edit'), - url(r'^(?P\d+)/view/$', 'metadata_view', (), 'metadata_view'), - url(r'^multiple/edit/$', 'metadata_multiple_edit', (), 'metadata_multiple_edit'), - url(r'^(?P\d+)/add/$', 'metadata_add', (), 'metadata_add'), - url(r'^multiple/add/$', 'metadata_multiple_add', (), 'metadata_multiple_add'), - url(r'^(?P\d+)/remove/$', 'metadata_remove', (), 'metadata_remove'), - url(r'^multiple/remove/$', 'metadata_multiple_remove', (), 'metadata_multiple_remove'), + url(r'^(?P\d+)/edit/$', 'metadata_edit', name='metadata_edit'), + url(r'^(?P\d+)/view/$', 'metadata_view', name='metadata_view'), + url(r'^multiple/edit/$', 'metadata_multiple_edit', name='metadata_multiple_edit'), + url(r'^(?P\d+)/add/$', 'metadata_add', name='metadata_add'), + url(r'^multiple/add/$', 'metadata_multiple_add', name='metadata_multiple_add'), + url(r'^(?P\d+)/remove/$', 'metadata_remove', name='metadata_remove'), + url(r'^multiple/remove/$', 'metadata_multiple_remove', name='metadata_multiple_remove'), - url(r'^setup/type/list/$', 'setup_metadata_type_list', (), 'setup_metadata_type_list'), - url(r'^setup/type/create/$', 'setup_metadata_type_create', (), 'setup_metadata_type_create'), - url(r'^setup/type/(?P\d+)/edit/$', 'setup_metadata_type_edit', (), 'setup_metadata_type_edit'), - url(r'^setup/type/(?P\d+)/delete/$', 'setup_metadata_type_delete', (), 'setup_metadata_type_delete'), + url(r'^setup/type/list/$', 'setup_metadata_type_list', name='setup_metadata_type_list'), + url(r'^setup/type/create/$', 'setup_metadata_type_create', name='setup_metadata_type_create'), + url(r'^setup/type/(?P\d+)/edit/$', 'setup_metadata_type_edit', name='setup_metadata_type_edit'), + url(r'^setup/type/(?P\d+)/delete/$', 'setup_metadata_type_delete', name='setup_metadata_type_delete'), url(r'^setup/document/type/(?P\d+)/metadata/edit/$', SetupDocumentTypeMetadataOptionalView.as_view(), name='setup_document_type_metadata'), url(r'^setup/document/type/(?P\d+)/metadata/edit/required/$', SetupDocumentTypeMetadataRequiredView.as_view(), name='setup_document_type_metadata_required'), diff --git a/mayan/apps/ocr/urls.py b/mayan/apps/ocr/urls.py index 02a0bb1120..09da9ebe4e 100644 --- a/mayan/apps/ocr/urls.py +++ b/mayan/apps/ocr/urls.py @@ -6,14 +6,14 @@ from .api_views import DocumentVersionOCRView urlpatterns = patterns( 'ocr.views', - url(r'^document/(?P\d+)/submit/$', 'document_submit', (), 'document_submit'), - url(r'^document/multiple/submit/$', 'document_submit_multiple', (), 'document_submit_multiple'), + url(r'^document/(?P\d+)/submit/$', 'document_submit', name='document_submit'), + url(r'^document/multiple/submit/$', 'document_submit_multiple', name='document_submit_multiple'), - url(r'^all/$', 'entry_list', (), 'entry_list'), - url(r'^(?P\d+)/delete/$', 'entry_delete', (), 'entry_delete'), - url(r'^multiple/delete/$', 'entry_delete_multiple', (), 'entry_delete_multiple'), - url(r'^(?P\d+)/re-queue/$', 'entry_re_queue', (), 'entry_re_queue'), - url(r'^multiple/re-queue/$', 'entry_re_queue_multiple', (), 'entry_re_queue_multiple'), + url(r'^all/$', 'entry_list', name='entry_list'), + url(r'^(?P\d+)/delete/$', 'entry_delete', name='entry_delete'), + url(r'^multiple/delete/$', 'entry_delete_multiple', name='entry_delete_multiple'), + url(r'^(?P\d+)/re-queue/$', 'entry_re_queue', name='entry_re_queue'), + url(r'^multiple/re-queue/$', 'entry_re_queue_multiple', name='entry_re_queue_multiple'), ) api_urls = patterns( diff --git a/mayan/apps/permissions/urls.py b/mayan/apps/permissions/urls.py index b6e6011796..a067a8dbde 100644 --- a/mayan/apps/permissions/urls.py +++ b/mayan/apps/permissions/urls.py @@ -9,15 +9,15 @@ from .views import ( urlpatterns = patterns( 'permissions.views', - url(r'^role/list/$', 'role_list', (), 'role_list'), + url(r'^role/list/$', 'role_list', name='role_list'), url(r'^role/create/$', RoleCreateView.as_view(), name='role_create'), - url(r'^role/(?P\d+)/permissions/$', 'role_permissions', (), 'role_permissions'), + url(r'^role/(?P\d+)/permissions/$', 'role_permissions', name='role_permissions'), url(r'^role/(?P\d+)/edit/$', RoleEditView.as_view(), name='role_edit'), url(r'^role/(?P\d+)/delete/$', RoleDeleteView.as_view(), name='role_delete'), url(r'^role/(?P\d+)/members/$', SetupRoleMembersView.as_view(), name='role_members'), - url(r'^permissions/multiple/grant/$', 'permission_grant', (), 'permission_multiple_grant'), - url(r'^permissions/multiple/revoke/$', 'permission_revoke', (), 'permission_multiple_revoke'), + url(r'^permissions/multiple/grant/$', 'permission_grant', name='permission_multiple_grant'), + url(r'^permissions/multiple/revoke/$', 'permission_revoke', name='permission_multiple_revoke'), ) api_urls = patterns( diff --git a/mayan/apps/smart_settings/urls.py b/mayan/apps/smart_settings/urls.py index 02028cb272..6bc2835333 100644 --- a/mayan/apps/smart_settings/urls.py +++ b/mayan/apps/smart_settings/urls.py @@ -4,5 +4,5 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'smart_settings.views', - url(r'^list/$', 'setting_list', (), 'setting_list'), + url(r'^list/$', 'setting_list', name='setting_list'), ) diff --git a/mayan/apps/sources/urls.py b/mayan/apps/sources/urls.py index 5aa87b7428..01eae6a63e 100644 --- a/mayan/apps/sources/urls.py +++ b/mayan/apps/sources/urls.py @@ -23,16 +23,16 @@ urlpatterns = patterns( # Setup views - url(r'^setup/list/$', 'setup_source_list', (), 'setup_source_list'), - url(r'^setup/(?P\d+)/edit/$', 'setup_source_edit', (), 'setup_source_edit'), + url(r'^setup/list/$', 'setup_source_list', name='setup_source_list'), + url(r'^setup/(?P\d+)/edit/$', 'setup_source_edit', name='setup_source_edit'), url(r'^setup/(?P\d+)/logs/$', SourceLogListView.as_view(), name='setup_source_logs'), - url(r'^setup/(?P\d+)/delete/$', 'setup_source_delete', (), 'setup_source_delete'), - url(r'^setup/(?P\w+)/create/$', 'setup_source_create', (), 'setup_source_create'), + url(r'^setup/(?P\d+)/delete/$', 'setup_source_delete', name='setup_source_delete'), + url(r'^setup/(?P\w+)/create/$', 'setup_source_create', name='setup_source_create'), # Document create views url(r'^create/from/local/multiple/$', DocumentCreateWizard.as_view(), name='document_create_multiple'), - url(r'^(?P\d+)/create/siblings/$', 'document_create_siblings', (), 'document_create_siblings'), + url(r'^(?P\d+)/create/siblings/$', 'document_create_siblings', name='document_create_siblings'), ) api_urls = patterns( diff --git a/mayan/apps/tags/urls.py b/mayan/apps/tags/urls.py index 829103af75..f896e7c976 100644 --- a/mayan/apps/tags/urls.py +++ b/mayan/apps/tags/urls.py @@ -10,22 +10,22 @@ from .views import TagTaggedItemListView urlpatterns = patterns( 'tags.views', - url(r'^list/$', 'tag_list', (), 'tag_list'), - url(r'^create/$', 'tag_create', (), 'tag_create'), - url(r'^(?P\d+)/delete/$', 'tag_delete', (), 'tag_delete'), - url(r'^(?P\d+)/edit/$', 'tag_edit', (), 'tag_edit'), + url(r'^list/$', 'tag_list', name='tag_list'), + url(r'^create/$', 'tag_create', name='tag_create'), + url(r'^(?P\d+)/delete/$', 'tag_delete', name='tag_delete'), + url(r'^(?P\d+)/edit/$', 'tag_edit', name='tag_edit'), url(r'^(?P\d+)/documents/$', TagTaggedItemListView.as_view(), name='tag_tagged_item_list'), - url(r'^multiple/delete/$', 'tag_multiple_delete', (), 'tag_multiple_delete'), + url(r'^multiple/delete/$', 'tag_multiple_delete', name='tag_multiple_delete'), - url(r'^multiple/remove/document/(?P\d+)/$', 'single_document_multiple_tag_remove', (), 'single_document_multiple_tag_remove'), - url(r'^multiple/remove/document/multiple/$', 'multiple_documents_selection_tag_remove', (), 'multiple_documents_selection_tag_remove'), + url(r'^multiple/remove/document/(?P\d+)/$', 'single_document_multiple_tag_remove', name='single_document_multiple_tag_remove'), + url(r'^multiple/remove/document/multiple/$', 'multiple_documents_selection_tag_remove', name='multiple_documents_selection_tag_remove'), - url(r'^selection/attach/document/(?P\d+)/$', 'tag_attach', (), 'tag_attach'), - url(r'^selection/attach/document/multiple/$', 'tag_multiple_attach', (), 'multiple_documents_tag_attach'), + url(r'^selection/attach/document/(?P\d+)/$', 'tag_attach', name='tag_attach'), + url(r'^selection/attach/document/multiple/$', 'tag_multiple_attach', name='multiple_documents_tag_attach'), - url(r'^for/document/(?P\d+)/$', 'document_tags', (), 'document_tags'), + url(r'^for/document/(?P\d+)/$', 'document_tags', name='document_tags'), - url(r'^(?P\d+)/acl/list/$', 'tag_acl_list', (), 'tag_acl_list'), + url(r'^(?P\d+)/acl/list/$', 'tag_acl_list', name='tag_acl_list'), ) api_urls = patterns( diff --git a/mayan/apps/user_management/urls.py b/mayan/apps/user_management/urls.py index a7809dd848..3532808f2b 100644 --- a/mayan/apps/user_management/urls.py +++ b/mayan/apps/user_management/urls.py @@ -10,20 +10,20 @@ from .views import GroupMembersView, UserGroupsView urlpatterns = patterns( 'user_management.views', - url(r'^user/list/$', 'user_list', (), 'user_list'), - url(r'^user/add/$', 'user_add', (), 'user_add'), - url(r'^user/(?P\d+)/edit/$', 'user_edit', (), 'user_edit'), - url(r'^user/(?P\d+)/delete/$', 'user_delete', (), 'user_delete'), - url(r'^user/multiple/delete/$', 'user_multiple_delete', (), 'user_multiple_delete'), - url(r'^user/(?P\d+)/set_password/$', 'user_set_password', (), 'user_set_password'), - url(r'^user/multiple/set_password/$', 'user_multiple_set_password', (), 'user_multiple_set_password'), + url(r'^user/list/$', 'user_list', name='user_list'), + url(r'^user/add/$', 'user_add', name='user_add'), + url(r'^user/(?P\d+)/edit/$', 'user_edit', name='user_edit'), + url(r'^user/(?P\d+)/delete/$', 'user_delete', name='user_delete'), + url(r'^user/multiple/delete/$', 'user_multiple_delete', name='user_multiple_delete'), + url(r'^user/(?P\d+)/set_password/$', 'user_set_password', name='user_set_password'), + url(r'^user/multiple/set_password/$', 'user_multiple_set_password', name='user_multiple_set_password'), url(r'^user/(?P\d+)/groups/$', UserGroupsView.as_view(), name='user_groups'), - url(r'^group/list/$', 'group_list', (), 'group_list'), - url(r'^group/add/$', 'group_add', (), 'group_add'), - url(r'^group/(?P\d+)/edit/$', 'group_edit', (), 'group_edit'), - url(r'^group/(?P\d+)/delete/$', 'group_delete', (), 'group_delete'), - url(r'^group/multiple/delete/$', 'group_multiple_delete', (), 'group_multiple_delete'), + url(r'^group/list/$', 'group_list', name='group_list'), + url(r'^group/add/$', 'group_add', name='group_add'), + url(r'^group/(?P\d+)/edit/$', 'group_edit', name='group_edit'), + url(r'^group/(?P\d+)/delete/$', 'group_delete', name='group_delete'), + url(r'^group/multiple/delete/$', 'group_multiple_delete', name='group_multiple_delete'), url(r'^group/(?P\d+)/members/$', GroupMembersView.as_view(), name='group_members'), )