diff --git a/mayan/apps/cabinets/urls.py b/mayan/apps/cabinets/urls.py index 4703ddeab7..ee87035a40 100644 --- a/mayan/apps/cabinets/urls.py +++ b/mayan/apps/cabinets/urls.py @@ -12,55 +12,62 @@ from .views import ( CabinetDeleteView, CabinetDetailView, CabinetEditView, CabinetListView, ) -urlpatterns = [ +urlpatterns_cabinets = [ url( - regex=r'^list/$', view=CabinetListView.as_view(), name='cabinet_list' + regex=r'^cabinets/$', view=CabinetListView.as_view(), name='cabinet_list' ), url( - regex=r'^(?P\d+)/child/add/$', view=CabinetChildAddView.as_view(), - name='cabinet_child_add' - ), - url( - regex=r'^create/$', view=CabinetCreateView.as_view(), + regex=r'^cabinets/create/$', view=CabinetCreateView.as_view(), name='cabinet_create' ), url( - regex=r'^(?P\d+)/edit/$', view=CabinetEditView.as_view(), - name='cabinet_edit' + regex=r'^cabinets/(?P\d+)/children/add/$', view=CabinetChildAddView.as_view(), + name='cabinet_child_add' ), url( - regex=r'^(?P\d+)/delete/$', view=CabinetDeleteView.as_view(), + regex=r'^cabinets/(?P\d+)/delete/$', view=CabinetDeleteView.as_view(), name='cabinet_delete' ), url( - regex=r'^(?P\d+)/$', view=CabinetDetailView.as_view(), - name='cabinet_view' + regex=r'^cabinets/(?P\d+)/edit/$', view=CabinetEditView.as_view(), + name='cabinet_edit' ), url( - regex=r'^document/(?P\d+)/cabinet/add/$', + regex=r'^cabinets/(?P\d+)/$', view=CabinetDetailView.as_view(), + name='cabinet_view' + ), +] + +urlpatterns_documents_cabinets = [ + url( + regex=r'^documents/(?P\d+)/cabinets/add/$', view=DocumentAddToCabinetView.as_view(), name='document_cabinet_add' ), url( - regex=r'^document/multiple/cabinet/add/$', + regex=r'^documents/multiple/cabinets/add/$', view=DocumentAddToCabinetView.as_view(), name='document_multiple_cabinet_add' ), url( - regex=r'^document/(?P\d+)/cabinet/remove/$', + regex=r'^documents/(?P\d+)/cabinets/remove/$', view=DocumentRemoveFromCabinetView.as_view(), name='document_cabinet_remove' ), url( - regex=r'^document/multiple/cabinet/remove/$', + regex=r'^documents/multiple/cabinets/remove/$', view=DocumentRemoveFromCabinetView.as_view(), name='multiple_document_cabinet_remove' ), url( - regex=r'^document/(?P\d+)/cabinet/list/$', + regex=r'^documents/(?P\d+)/cabinets/$', view=DocumentCabinetListView.as_view(), name='document_cabinet_list' ), ] +urlpatterns = [] +urlpatterns.extend(urlpatterns_cabinets) +urlpatterns.extend(urlpatterns_documents_cabinets) + api_urls = [ url( regex=r'^cabinets/(?P[0-9]+)/documents/(?P[0-9]+)/$', diff --git a/mayan/apps/common/urls.py b/mayan/apps/common/urls.py index 205c90b066..26d1c317e4 100644 --- a/mayan/apps/common/urls.py +++ b/mayan/apps/common/urls.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from django.conf.urls import url -from django.views.i18n import JavaScriptCatalog, set_language +from django.views.i18n import JavaScriptCatalog from .api_views import ( APIContentTypeList, APITemplateDetailView, APITemplateListView @@ -13,23 +13,7 @@ from .views import ( RootView, SetupListView, ToolsListView ) -urlpatterns = [ - 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(regex=r'^license/$', view=LicenseView.as_view(), name='license_view'), - url(regex=r'^setup/$', view=SetupListView.as_view(), name='setup_list'), - url(regex=r'^tools/$', view=ToolsListView.as_view(), name='tools_list'), - url( - regex=r'^user/locale/$', - view=CurrentUserLocaleProfileDetailsView.as_view(), - name='current_user_locale_profile_details' - ), - url( - regex=r'^user/locale/edit/$', - view=CurrentUserLocaleProfileEditView.as_view(), - name='current_user_locale_profile_edit' - ), +urlpatterns_error_logs = [ url( regex=r'^object/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/errors/$', view=ObjectErrorLogEntryListView.as_view(), name='object_error_list' @@ -41,7 +25,20 @@ urlpatterns = [ ), ] -urlpatterns += [ +urlpatterns_user_locale = [ + url( + regex=r'^user/locale/$', + view=CurrentUserLocaleProfileDetailsView.as_view(), + name='current_user_locale_profile_details' + ), + url( + regex=r'^user/locale/edit/$', + view=CurrentUserLocaleProfileEditView.as_view(), + name='current_user_locale_profile_edit' + ), +] + +urlpatterns_misc = [ url( regex=r'^favicon\.ico$', view=FaviconRedirectView.as_view() ), @@ -49,11 +46,21 @@ urlpatterns += [ regex=r'^jsi18n/(?P\S+?)/$', view=JavaScriptCatalog.as_view(), name='javascript_catalog' ), - url( - regex=r'^set_language/$', view=set_language, name='set_language' - ), ] +urlpatterns = [ + 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(regex=r'^license/$', view=LicenseView.as_view(), name='license_view'), + url(regex=r'^setup/$', view=SetupListView.as_view(), name='setup_list'), + url(regex=r'^tools/$', view=ToolsListView.as_view(), name='tools_list'), +] + +urlpatterns.extend(urlpatterns_error_logs) +urlpatterns.extend(urlpatterns_misc) +urlpatterns.extend(urlpatterns_user_locale) + api_urls = [ url( regex=r'^content_types/$', view=APIContentTypeList.as_view(), diff --git a/mayan/apps/converter/urls.py b/mayan/apps/converter/urls.py index a43042decd..0e46ddbbba 100644 --- a/mayan/apps/converter/urls.py +++ b/mayan/apps/converter/urls.py @@ -9,19 +9,19 @@ from .views import ( urlpatterns = [ url( - regex=r'^create_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', - view=TransformationCreateView.as_view(), name='transformation_create' - ), - url( - regex=r'^list_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', + regex=r'^object/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/transformations/$', view=TransformationListView.as_view(), name='transformation_list' ), url( - regex=r'^delete/(?P\d+)/$', view=TransformationDeleteView.as_view(), + regex=r'^object/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/transformations/create/$', + view=TransformationCreateView.as_view(), name='transformation_create' + ), + url( + regex=r'^transformations/(?P\d+)/delete/$', view=TransformationDeleteView.as_view(), name='transformation_delete' ), url( - regex=r'^edit/(?P\d+)/$', view=TransformationEditView.as_view(), + regex=r'^transformations/(?P\d+)/edit/$', view=TransformationEditView.as_view(), name='transformation_edit' ), ] diff --git a/mayan/apps/django_gpg/urls.py b/mayan/apps/django_gpg/urls.py index a3f4ba10ad..d44b7e1bcb 100644 --- a/mayan/apps/django_gpg/urls.py +++ b/mayan/apps/django_gpg/urls.py @@ -11,35 +11,35 @@ from .views import ( urlpatterns = [ url( - regex=r'^(?P\d+)/$', view=KeyDetailView.as_view(), + regex=r'^keys/(?P\d+)/$', view=KeyDetailView.as_view(), name='key_detail' ), url( - regex=r'^(?P\d+)/delete/$', view=KeyDeleteView.as_view(), + regex=r'^keys/(?P\d+)/delete/$', view=KeyDeleteView.as_view(), name='key_delete' ), url( - regex=r'^(?P\d+)/download/$', view=KeyDownloadView.as_view(), + regex=r'^keys/(?P\d+)/download/$', view=KeyDownloadView.as_view(), name='key_download' ), url( - regex=r'^list/private/$', view=PrivateKeyListView.as_view(), + regex=r'^keys/private/$', view=PrivateKeyListView.as_view(), name='key_private_list' ), url( - regex=r'^list/public/$', view=PublicKeyListView.as_view(), + regex=r'^keys/public/$', view=PublicKeyListView.as_view(), name='key_public_list' ), url( - regex=r'^upload/$', view=KeyUploadView.as_view(), name='key_upload' + regex=r'^keys/upload/$', view=KeyUploadView.as_view(), name='key_upload' ), - url(regex=r'^query/$', view=KeyQueryView.as_view(), name='key_query'), + url(regex=r'^keys/query/$', view=KeyQueryView.as_view(), name='key_query'), url( - regex=r'^query/results/$', view=KeyQueryResultView.as_view(), + regex=r'^keys/query/results/$', view=KeyQueryResultView.as_view(), name='key_query_results' ), url( - regex=r'^receive/(?P.+)/$', view=KeyReceive.as_view(), + regex=r'^keys/receive/(?P.+)/$', view=KeyReceive.as_view(), name='key_receive' ), ] diff --git a/mayan/apps/document_comments/urls.py b/mayan/apps/document_comments/urls.py index 3250e3ffa7..256776f8a5 100644 --- a/mayan/apps/document_comments/urls.py +++ b/mayan/apps/document_comments/urls.py @@ -11,25 +11,25 @@ from .views import ( urlpatterns = [ url( - regex=r'^(?P\d+)/comment/add/$', + regex=r'^documents/(?P\d+)/comments/$', + view=DocumentCommentListView.as_view(), name='comments_for_document' + ), + url( + regex=r'^documents/(?P\d+)/comments/add/$', view=DocumentCommentCreateView.as_view(), name='comment_add' ), url( - regex=r'^comment/(?P\d+)/delete/$', + regex=r'^comments/(?P\d+)/delete/$', view=DocumentCommentDeleteView.as_view(), name='comment_delete' ), url( - regex=r'^comment/(?P\d+)/$', + regex=r'^comments/(?P\d+)/$', view=DocumentCommentDetailView.as_view(), name='comment_details' ), url( - regex=r'^comment/(?P\d+)/edit/$', + regex=r'^comments/(?P\d+)/edit/$', view=DocumentCommentEditView.as_view(), name='comment_edit' ), - url( - regex=r'^(?P\d+)/comment/list/$', - view=DocumentCommentListView.as_view(), name='comments_for_document' - ), ] api_urls = [ diff --git a/mayan/apps/document_indexing/urls.py b/mayan/apps/document_indexing/urls.py index d34650c1b5..dab69a5aa5 100644 --- a/mayan/apps/document_indexing/urls.py +++ b/mayan/apps/document_indexing/urls.py @@ -15,72 +15,81 @@ from .views import ( TemplateNodeCreateView, TemplateNodeDeleteView, TemplateNodeEditView ) -urlpatterns = [ +urlpatterns_indexes = [ url( - regex=r'^setup/document_types/(?P\d+)/index_templates/$', + regex=r'^document_types/(?P\d+)/index_templates/$', view=DocumentTypeIndexesView.as_view(), name='document_type_index_templates' ), url( - regex=r'^setup/index/list/$', view=SetupIndexListView.as_view(), + regex=r'^indexes/$', view=SetupIndexListView.as_view(), name='index_setup_list' ), url( - regex=r'^setup/index/create/$', view=SetupIndexCreateView.as_view(), + regex=r'^indexes/create/$', view=SetupIndexCreateView.as_view(), name='index_setup_create' ), url( - regex=r'^setup/index/(?P\d+)/edit/$', - view=SetupIndexEditView.as_view(), name='index_setup_edit' - ), - url( - regex=r'^setup/index/(?P\d+)/delete/$', + regex=r'^indexes/(?P\d+)/delete/$', view=SetupIndexDeleteView.as_view(), name='index_setup_delete' ), url( - regex=r'^setup/index/(?P\d+)/template/$', - view=SetupIndexTreeTemplateListView.as_view(), name='index_setup_view' + regex=r'^indexes/(?P\d+)/edit/$', + view=SetupIndexEditView.as_view(), name='index_setup_edit' ), url( - regex=r'^setup/index/(?P\d+)/document_types/$', + regex=r'^indexes/(?P\d+)/document_types/$', view=SetupIndexDocumentTypesView.as_view(), name='index_setup_document_types' ), url( - regex=r'^setup/index/(?P\d+)/rebuild/$', + regex=r'^indexes/(?P\d+)/rebuild/$', view=SetupIndexRebuildView.as_view(), name='index_setup_rebuild' ), url( - regex=r'^setup/template/node/(?P\d+)/create/child/$', + regex=r'^indexes/(?P\d+)/nodes/$', + view=SetupIndexTreeTemplateListView.as_view(), name='index_setup_view' + ), + url( + regex=r'^indexes/nodes/(?P\d+)/children/create/$', view=TemplateNodeCreateView.as_view(), name='template_node_create' ), url( - regex=r'^setup/template/node/(?P\d+)/edit/$', - view=TemplateNodeEditView.as_view(), name='template_node_edit' - ), - url( - regex=r'^setup/template/node/(?P\d+)/delete/$', + regex=r'^indexes/nodes/(?P\d+)/delete/$', view=TemplateNodeDeleteView.as_view(), name='template_node_delete' ), - url( - regex=r'^index/list/$', view=IndexListView.as_view(), name='index_list' + regex=r'^indexes/nodes/(?P\d+)/edit/$', + view=TemplateNodeEditView.as_view(), name='template_node_edit' + ), +] + +urlpatterns_index_instances = [ + url( + regex=r'^index_instances/$', view=IndexListView.as_view(), name='index_list' ), url( - regex=r'^instance/node/(?P\d+)/$', + regex=r'^index_instances/nodes/(?P\d+)/$', view=IndexInstanceNodeView.as_view(), name='index_instance_node_view' ), + url( + regex=r'^documents/(?P\d+)/index_instances/$', + view=DocumentIndexNodeListView.as_view(), name='document_index_list' + ), +] +urlpatterns_tools = [ url( regex=r'^indexes/rebuild/$', view=IndexesRebuildView.as_view(), name='rebuild_index_instances' ), - url( - regex=r'^list/for/document/(?P\d+)/$', - view=DocumentIndexNodeListView.as_view(), name='document_index_list' - ), ] +urlpatterns = [] +urlpatterns.extend(urlpatterns_indexes) +urlpatterns.extend(urlpatterns_index_instances) +urlpatterns.extend(urlpatterns_tools) + api_urls = [ url( regex=r'^indexes/node/(?P[0-9]+)/documents/$', diff --git a/mayan/apps/document_signatures/urls.py b/mayan/apps/document_signatures/urls.py index a70ec1c85c..cbc1896df5 100644 --- a/mayan/apps/document_signatures/urls.py +++ b/mayan/apps/document_signatures/urls.py @@ -12,37 +12,37 @@ from .views import ( urlpatterns = [ url( - regex=r'^(?P\d+)/details/$', + regex=r'^signatures/(?P\d+)/details/$', view=DocumentVersionSignatureDetailView.as_view(), name='document_version_signature_details' ), url( - regex=r'^signature/(?P\d+)/download/$', + regex=r'^signatures/(?P\d+)/download/$', view=DocumentVersionSignatureDownloadView.as_view(), name='document_version_signature_download' ), url( - regex=r'^document/version/(?P\d+)/signatures/list/$', + regex=r'^documents/versions/(?P\d+)/signatures/$', view=DocumentVersionSignatureListView.as_view(), name='document_version_signature_list' ), url( - regex=r'^documents/version/(?P\d+)/signature/detached/upload/$', + regex=r'^documents/versions/(?P\d+)/signatures/detached/upload/$', view=DocumentVersionSignatureUploadView.as_view(), name='document_version_signature_upload' ), url( - regex=r'^documents/version/(?P\d+)/signature/detached/create/$', + regex=r'^documents/versions/(?P\d+)/signatures/detached/create/$', view=DocumentVersionDetachedSignatureCreateView.as_view(), name='document_version_signature_detached_create' ), url( - regex=r'^documents/version/(?P\d+)/signature/embedded/create/$', + regex=r'^documents/versions/(?P\d+)/signatures/embedded/create/$', view=DocumentVersionEmbeddedSignatureCreateView.as_view(), name='document_version_signature_embedded_create' ), url( - regex=r'^signature/(?P\d+)/delete/$', + regex=r'^signatures/(?P\d+)/delete/$', view=DocumentVersionSignatureDeleteView.as_view(), name='document_version_signature_delete' ), diff --git a/mayan/apps/document_states/urls.py b/mayan/apps/document_states/urls.py index 6b36dd490c..e184830e70 100644 --- a/mayan/apps/document_states/urls.py +++ b/mayan/apps/document_states/urls.py @@ -225,7 +225,7 @@ urlpatterns_workflow_transition_fields = [ ), ] -urlpatterns = [ +urlpatterns_tools = [ url( regex=r'^tools/workflows/launch/$', view=ToolLaunchWorkflows.as_view(), @@ -233,6 +233,8 @@ urlpatterns = [ ), ] +urlpatterns = [] +urlpatterns.extend(urlpatterns_tools) urlpatterns.extend(urlpatterns_workflow_instances) urlpatterns.extend(urlpatterns_workflow_runtime_proxies) urlpatterns.extend(urlpatterns_workflow_states) diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py index bef5d0174a..84aec25094 100644 --- a/mayan/apps/documents/urls.py +++ b/mayan/apps/documents/urls.py @@ -12,33 +12,37 @@ from .api_views import ( APIDocumentVersionPageListView, APIDocumentVersionView, APIRecentDocumentListView ) -from .views import ( +from .views.document_views import ( DocumentDocumentTypeEditView, DocumentDownloadFormView, DocumentDownloadView, DocumentDuplicatesListView, DocumentEditView, - DocumentListView, DocumentPageListView, DocumentPageNavigationFirst, - DocumentPageNavigationLast, DocumentPageNavigationNext, - DocumentPageNavigationPrevious, DocumentPageRotateLeftView, - DocumentPageRotateRightView, DocumentPageView, DocumentPageViewResetView, - DocumentPageZoomInView, DocumentPageZoomOutView, DocumentPreviewView, - DocumentPrint, DocumentTransformationsClearView, - DocumentTransformationsCloneView, DocumentTypeCreateView, - DocumentTypeDeleteView, DocumentTypeDocumentListView, - DocumentTypeFilenameCreateView, DocumentTypeFilenameDeleteView, - DocumentTypeFilenameEditView, DocumentTypeFilenameListView, - DocumentTypeListView, DocumentTypeEditView, DocumentUpdatePageCountView, - DocumentVersionDownloadFormView, DocumentVersionDownloadView, - DocumentVersionListView, DocumentVersionRevertView, DocumentVersionView, - DocumentView, DuplicatedDocumentListView, - RecentAccessDocumentListView, RecentAddedDocumentListView, - ScanDuplicatedDocuments + DocumentListView, DocumentPreviewView, DocumentPrint, + DocumentTransformationsClearView, DocumentTransformationsCloneView, + DocumentUpdatePageCountView, DocumentView, DuplicatedDocumentListView, + RecentAccessDocumentListView, RecentAddedDocumentListView ) from .views.document_page_views import ( - DocumentPageDisable, DocumentPageEnable + DocumentPageDisable, DocumentPageEnable, DocumentPageListView, + DocumentPageNavigationFirst, DocumentPageNavigationLast, + DocumentPageNavigationNext, DocumentPageNavigationPrevious, + DocumentPageRotateLeftView, DocumentPageRotateRightView, + DocumentPageView, DocumentPageViewResetView, DocumentPageZoomInView, + DocumentPageZoomOutView +) +from .views.document_version_views import ( + DocumentVersionDownloadFormView, DocumentVersionDownloadView, + DocumentVersionListView, DocumentVersionRevertView, DocumentVersionView, +) +from .views.document_type_views import ( + DocumentTypeCreateView, DocumentTypeDeleteView, + DocumentTypeDeletionPoliciesEditView, DocumentTypeDocumentListView, + DocumentTypeEditView, DocumentTypeFilenameCreateView, + DocumentTypeFilenameDeleteView, DocumentTypeFilenameEditView, + DocumentTypeFilenameListView, DocumentTypeListView ) -from .views.document_type_views import DocumentTypeDeletionPoliciesEditView from .views.favorite_document_views import ( FavoriteAddView, FavoriteDocumentListView, FavoriteRemoveView ) +from .views.misc_views import ScanDuplicatedDocuments from .views.trashed_document_views import ( DocumentTrashView, EmptyTrashCanView, TrashedDocumentDeleteView, TrashedDocumentListView, TrashedDocumentRestoreView @@ -46,48 +50,48 @@ from .views.trashed_document_views import ( urlpatterns_document_types = [ url( - regex=r'^type/list/$', view=DocumentTypeListView.as_view(), + regex=r'^document_types/$', view=DocumentTypeListView.as_view(), name='document_type_list' ), url( - regex=r'^type/create/$', view=DocumentTypeCreateView.as_view(), + regex=r'^document_types/create/$', view=DocumentTypeCreateView.as_view(), name='document_type_create' ), url( - regex=r'^type/(?P\d+)/edit/$', view=DocumentTypeEditView.as_view(), - name='document_type_edit' - ), - url( - regex=r'^type/(?P\d+)/delete/$', + regex=r'^document_types/(?P\d+)/delete/$', view=DocumentTypeDeleteView.as_view(), name='document_type_delete' ), url( - regex=r'^type/(?P\d+)/documents/$', + regex=r'^document_types/(?P\d+)/edit/$', view=DocumentTypeEditView.as_view(), + name='document_type_edit' + ), + url( + regex=r'^document_types/(?P\d+)/documents/$', view=DocumentTypeDocumentListView.as_view(), name='document_type_document_list' ), url( - regex=r'^type/(?P\d+)/filename/list/$', + regex=r'^document_types/(?P\d+)/filenames/$', view=DocumentTypeFilenameListView.as_view(), name='document_type_filename_list' ), url( - regex=r'^type/filename/(?P\d+)/edit/$', - view=DocumentTypeFilenameEditView.as_view(), - name='document_type_filename_edit' - ), - url( - regex=r'^type/filename/(?P\d+)/delete/$', + regex=r'^document_types/filenames/(?P\d+)/delete/$', view=DocumentTypeFilenameDeleteView.as_view(), name='document_type_filename_delete' ), url( - regex=r'^type/(?P\d+)/filename/create/$', + regex=r'^document_types/filenames/(?P\d+)/edit/$', + view=DocumentTypeFilenameEditView.as_view(), + name='document_type_filename_edit' + ), + url( + regex=r'^document_types/(?P\d+)/filenames/create/$', view=DocumentTypeFilenameCreateView.as_view(), name='document_type_filename_create' ), url( - regex=r'^type/(?P\d+)/deletion_policies/$', + regex=r'^document_types/(?P\d+)/deletion_policies/$', view=DocumentTypeDeletionPoliciesEditView.as_view(), name='document_type_policies' ), @@ -95,259 +99,270 @@ urlpatterns_document_types = [ urlpatterns_favorite_documents = [ url( - regex=r'^list/favorites/$', view=FavoriteDocumentListView.as_view(), + regex=r'^documents/favorites/$', view=FavoriteDocumentListView.as_view(), name='document_list_favorites' ), url( - regex=r'^(?P\d+)/add_to_favorites/$', + regex=r'^documents/(?P\d+)/add_to_favorites/$', view=FavoriteAddView.as_view(), name='document_add_to_favorites' ), url( - regex=r'^multiple/add_to_favorites/$', view=FavoriteAddView.as_view(), + regex=r'^documents/multiple/add_to_favorites/$', view=FavoriteAddView.as_view(), name='document_multiple_add_to_favorites' ), url( - regex=r'^(?P\d+)/remove_from_favorites/$', + regex=r'^documents/(?P\d+)/remove_from_favorites/$', view=FavoriteRemoveView.as_view(), name='document_remove_from_favorites' ), url( - regex=r'^multiple/remove_from_favorites/$', + regex=r'^documents/multiple/remove_from_favorites/$', view=FavoriteRemoveView.as_view(), name='document_multiple_remove_from_favorites' ), +] + +urlpatterns_documents = [ + url( + regex=r'^documents/$', view=DocumentListView.as_view(), name='document_list' + ), + url( + regex=r'^documents/recent_access/$', + view=RecentAccessDocumentListView.as_view(), + name='document_list_recent_access' + ), + url( + regex=r'^documents/recent_added/$', + view=RecentAddedDocumentListView.as_view(), + name='document_list_recent_added' + ), + url( + regex=r'^documents/duplicated/$', + view=DuplicatedDocumentListView.as_view(), + name='duplicated_document_list' + ), + url( + regex=r'^documents/(?P\d+)/preview/$', view=DocumentPreviewView.as_view(), + name='document_preview' + ), + url( + regex=r'^documents/(?P\d+)/properties/$', view=DocumentView.as_view(), + name='document_properties' + ), + url( + regex=r'^documents/(?P\d+)/duplicates/$', + view=DocumentDuplicatesListView.as_view(), + name='document_duplicates_list' + ), + url( + regex=r'^documents/(?P\d+)/type/$', + view=DocumentDocumentTypeEditView.as_view(), + name='document_document_type_edit' + ), + url( + regex=r'^documents/multiple/type/$', view=DocumentDocumentTypeEditView.as_view(), + name='document_multiple_document_type_edit' + ), + url( + regex=r'^documents/(?P\d+)/edit/$', view=DocumentEditView.as_view(), + name='document_edit' + ), + url( + regex=r'^documents/(?P\d+)/print/$', view=DocumentPrint.as_view(), + name='document_print' + ), + url( + regex=r'^documents/(?P\d+)/reset_page_count/$', + view=DocumentUpdatePageCountView.as_view(), + name='document_update_page_count' + ), + url( + regex=r'^documents/multiple/reset_page_count/$', + view=DocumentUpdatePageCountView.as_view(), + name='document_multiple_update_page_count' + ), + url( + regex=r'^documents/(?P\d+)/download/form/$', + view=DocumentDownloadFormView.as_view(), name='document_download_form' + ), + url( + regex=r'^documents/(?P\d+)/download/$', view=DocumentDownloadView.as_view(), + name='document_download' + ), + url( + regex=r'^documents/multiple/download/form/$', + view=DocumentDownloadFormView.as_view(), + name='document_multiple_download_form' + ), + url( + regex=r'^documents/multiple/download/$', view=DocumentDownloadView.as_view(), + name='document_multiple_download' + ), + url( + regex=r'^documents/(?P\d+)/transformations/clear/$', + view=DocumentTransformationsClearView.as_view(), + name='document_clear_transformations' + ), + url( + regex=r'^documents/multiple/clear_transformations/$', + view=DocumentTransformationsClearView.as_view(), + name='document_multiple_clear_transformations' + ), + url( + regex=r'^documents/(?P\d+)/transformations/clone/$', + view=DocumentTransformationsCloneView.as_view(), + name='document_clone_transformations' + ), +] + +urlpatterns_document_pages = [ + url( + regex=r'^documents/(?P\d+)/pages/$', view=DocumentPageListView.as_view(), + name='document_pages' + ), + url( + regex=r'^documents/pages/(?P\d+)/$', view=DocumentPageView.as_view(), + name='document_page_view' + ), + url( + regex=r'^documents/pages/(?P\d+)/disable/$', + name='document_page_disable', view=DocumentPageDisable.as_view() + ), + url( + regex=r'^documents/pages/multiple/disable/$', name='document_page_multiple_disable', + view=DocumentPageDisable.as_view() + ), + url( + regex=r'^documents/pages/(?P\d+)/enable/$', + name='document_page_enable', view=DocumentPageEnable.as_view() + ), + url( + regex=r'^documents/pages/multiple/enable/$', name='document_page_multiple_enable', + view=DocumentPageEnable.as_view() + ), + url( + regex=r'^documents/pages/(?P\d+)/navigation/next/$', + view=DocumentPageNavigationNext.as_view(), + name='document_page_navigation_next' + ), + url( + regex=r'^documents/pages/(?P\d+)/navigation/previous/$', + view=DocumentPageNavigationPrevious.as_view(), + name='document_page_navigation_previous' + ), + url( + regex=r'^documents/pages/(?P\d+)/navigation/first/$', + view=DocumentPageNavigationFirst.as_view(), + name='document_page_navigation_first' + ), + url( + regex=r'^documents/pages/(?P\d+)/navigation/last/$', + view=DocumentPageNavigationLast.as_view(), + name='document_page_navigation_last' + ), + url( + regex=r'^documents/pages/(?P\d+)/zoom/in/$', + view=DocumentPageZoomInView.as_view(), name='document_page_zoom_in' + ), + url( + regex=r'^documents/pages/(?P\d+)/zoom/out/$', + view=DocumentPageZoomOutView.as_view(), name='document_page_zoom_out' + ), + url( + regex=r'^documents/pages/(?P\d+)/rotate/left/$', + view=DocumentPageRotateLeftView.as_view(), + name='document_page_rotate_left' + ), + url( + regex=r'^documents/pages/(?P\d+)/rotate/right/$', + view=DocumentPageRotateRightView.as_view(), + name='document_page_rotate_right' + ), + url( + regex=r'^documents/pages/(?P\d+)/reset/$', + view=DocumentPageViewResetView.as_view(), + name='document_page_view_reset' + ), +] + +urlpatterns_document_versions = [ + url( + regex=r'^documents/(?P\d+)/versions/$', + view=DocumentVersionListView.as_view(), + name='document_version_list' + ), + url( + regex=r'^documents/versions/(?P\d+)/download/form/$', + view=DocumentVersionDownloadFormView.as_view(), + name='document_version_download_form' + ), + url( + regex=r'^documents/versions/(?P\d+)/$', + view=DocumentVersionView.as_view(), name='document_version_view' + ), + url( + regex=r'^documents/versions/(?P\d+)/download/$', + view=DocumentVersionDownloadView.as_view(), + name='document_version_download' + ), + url( + regex=r'^documents/versions/(?P\d+)/revert/$', + view=DocumentVersionRevertView.as_view(), + name='document_version_revert' + ), +] + +urlpatterns_tools = [ + url( + regex=r'^tools/documents/duplicated/scan/$', + view=ScanDuplicatedDocuments.as_view(), + name='duplicated_document_scan' + ), +] + +urlpatterns_trashed_documents = [ + url( + regex=r'^documents/(?P\d+)/trash/$', view=DocumentTrashView.as_view(), + name='document_trash' + ), + url( + regex=r'^documents/multiple/trash/$', view=DocumentTrashView.as_view(), + name='document_multiple_trash' + ), + url( + regex=r'^trashed_documents/$', view=TrashedDocumentListView.as_view(), + name='document_list_deleted' + ), + url( + regex=r'^trashed_documents/(?P\d+)/restore/$', + view=TrashedDocumentRestoreView.as_view(), name='document_restore' + ), + url( + regex=r'^trashed_documents/multiple/restore/$', view=TrashedDocumentRestoreView.as_view(), + name='document_multiple_restore' + ), + url( + regex=r'^trashed_documents/(?P\d+)/delete/$', + view=TrashedDocumentDeleteView.as_view(), name='document_delete' + ), + url( + regex=r'^trashed_documents/multiple/delete/$', + view=TrashedDocumentDeleteView.as_view(), + name='document_multiple_delete' + ), url( regex=r'^trash_can/empty/$', view=EmptyTrashCanView.as_view(), name='trash_can_empty' ), ] -urlpatterns_trashed_documents = [ - url( - regex=r'^(?P\d+)/trash/$', view=DocumentTrashView.as_view(), - name='document_trash' - ), - url( - regex=r'^multiple/trash/$', view=DocumentTrashView.as_view(), - name='document_multiple_trash' - ), - url( - regex=r'^list/deleted/$', view=TrashedDocumentListView.as_view(), - name='document_list_deleted' - ), - url( - regex=r'^(?P\d+)/restore/$', - view=TrashedDocumentRestoreView.as_view(), name='document_restore' - ), - url( - regex=r'^multiple/restore/$', view=TrashedDocumentRestoreView.as_view(), - name='document_multiple_restore' - ), - url( - regex=r'^(?P\d+)/delete/$', - view=TrashedDocumentDeleteView.as_view(), name='document_delete' - ), - url( - regex=r'^multiple/delete/$', - view=TrashedDocumentDeleteView.as_view(), - name='document_multiple_delete' - ), -] - -urlpatterns = [ - url( - 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( - regex=r'^list/recent_added/$', - view=RecentAddedDocumentListView.as_view(), - name='document_list_recent_added' - ), - url( - regex=r'^list/duplicated/$', - view=DuplicatedDocumentListView.as_view(), - name='duplicated_document_list' - ), - url( - regex=r'^(?P\d+)/preview/$', view=DocumentPreviewView.as_view(), - name='document_preview' - ), - url( - regex=r'^(?P\d+)/properties/$', view=DocumentView.as_view(), - name='document_properties' - ), - url( - regex=r'^(?P\d+)/duplicates/$', - view=DocumentDuplicatesListView.as_view(), - name='document_duplicates_list' - ), - url( - regex=r'^(?P\d+)/type/$', - view=DocumentDocumentTypeEditView.as_view(), - name='document_document_type_edit' - ), - url( - regex=r'^multiple/type/$', view=DocumentDocumentTypeEditView.as_view(), - name='document_multiple_document_type_edit' - ), - url( - regex=r'^(?P\d+)/edit/$', view=DocumentEditView.as_view(), - name='document_edit' - ), - url( - regex=r'^(?P\d+)/print/$', view=DocumentPrint.as_view(), - name='document_print' - ), - url( - regex=r'^(?P\d+)/reset_page_count/$', - view=DocumentUpdatePageCountView.as_view(), - name='document_update_page_count' - ), - url( - regex=r'^multiple/reset_page_count/$', - view=DocumentUpdatePageCountView.as_view(), - name='document_multiple_update_page_count' - ), - url( - regex=r'^(?P\d+)/download/form/$', - view=DocumentDownloadFormView.as_view(), name='document_download_form' - ), - url( - regex=r'^(?P\d+)/download/$', view=DocumentDownloadView.as_view(), - name='document_download' - ), - url( - regex=r'^multiple/download/form/$', - view=DocumentDownloadFormView.as_view(), - name='document_multiple_download_form' - ), - url( - regex=r'^multiple/download/$', view=DocumentDownloadView.as_view(), - name='document_multiple_download' - ), - url( - regex=r'^(?P\d+)/clear_transformations/$', - view=DocumentTransformationsClearView.as_view(), - name='document_clear_transformations' - ), - url( - regex=r'^(?P\d+)/clone_transformations/$', - view=DocumentTransformationsCloneView.as_view(), - name='document_clone_transformations' - ), - url( - regex=r'^(?P\d+)/version/all/$', - view=DocumentVersionListView.as_view(), - name='document_version_list' - ), - url( - regex=r'^document/version/(?P\d+)/download/form/$', - view=DocumentVersionDownloadFormView.as_view(), - name='document_version_download_form' - ), - url( - regex=r'^document/version/(?P\d+)/$', - view=DocumentVersionView.as_view(), name='document_version_view' - ), - url( - regex=r'^document/version/(?P\d+)/download/$', - view=DocumentVersionDownloadView.as_view(), - name='document_version_download' - ), - url( - regex=r'^document/version/(?P\d+)/revert/$', - view=DocumentVersionRevertView.as_view(), - name='document_version_revert' - ), - - url( - regex=r'^(?P\d+)/pages/all/$', view=DocumentPageListView.as_view(), - name='document_pages' - ), - url( - regex=r'^multiple/clear_transformations/$', - view=DocumentTransformationsClearView.as_view(), - name='document_multiple_clear_transformations' - ), - url( - regex=r'^page/(?P\d+)/$', view=DocumentPageView.as_view(), - name='document_page_view' - ), - url( - regex=r'^pages/(?P\d+)/disable/$', - name='document_page_disable', view=DocumentPageDisable.as_view() - ), - url( - regex=r'^pages/multiple/disable/$', name='document_page_multiple_disable', - view=DocumentPageDisable.as_view() - ), - url( - regex=r'^pages/(?P\d+)/enable/$', - name='document_page_enable', view=DocumentPageEnable.as_view() - ), - url( - regex=r'^pages/multiple/enable/$', name='document_page_multiple_enable', - view=DocumentPageEnable.as_view() - ), - url( - regex=r'^page/(?P\d+)/navigation/next/$', - view=DocumentPageNavigationNext.as_view(), - name='document_page_navigation_next' - ), - url( - regex=r'^page/(?P\d+)/navigation/previous/$', - view=DocumentPageNavigationPrevious.as_view(), - name='document_page_navigation_previous' - ), - url( - regex=r'^page/(?P\d+)/navigation/first/$', - view=DocumentPageNavigationFirst.as_view(), - name='document_page_navigation_first' - ), - url( - regex=r'^page/(?P\d+)/navigation/last/$', - view=DocumentPageNavigationLast.as_view(), - name='document_page_navigation_last' - ), - url( - regex=r'^page/(?P\d+)/zoom/in/$', - view=DocumentPageZoomInView.as_view(), name='document_page_zoom_in' - ), - url( - regex=r'^page/(?P\d+)/zoom/out/$', - view=DocumentPageZoomOutView.as_view(), name='document_page_zoom_out' - ), - url( - regex=r'^page/(?P\d+)/rotate/left/$', - view=DocumentPageRotateLeftView.as_view(), - name='document_page_rotate_left' - ), - url( - regex=r'^page/(?P\d+)/rotate/right/$', - view=DocumentPageRotateRightView.as_view(), - name='document_page_rotate_right' - ), - url( - regex=r'^page/(?P\d+)/reset/$', - view=DocumentPageViewResetView.as_view(), - name='document_page_view_reset' - ), - - # Tools - - url( - regex=r'^tools/documents/duplicated/scan/$', - view=ScanDuplicatedDocuments.as_view(), - name='duplicated_document_scan' - ), -] +urlpatterns = [] +urlpatterns.extend(urlpatterns_documents) +urlpatterns.extend(urlpatterns_document_pages) urlpatterns.extend(urlpatterns_document_types) +urlpatterns.extend(urlpatterns_document_versions) urlpatterns.extend(urlpatterns_favorite_documents) +urlpatterns.extend(urlpatterns_tools) urlpatterns.extend(urlpatterns_trashed_documents) api_urls = [ diff --git a/mayan/apps/events/urls.py b/mayan/apps/events/urls.py index f46d2b7ad2..457345c4a4 100644 --- a/mayan/apps/events/urls.py +++ b/mayan/apps/events/urls.py @@ -14,44 +14,55 @@ from .views import ( VerbEventListView ) -urlpatterns = [ - url(regex=r'^all/$', view=EventListView.as_view(), name='events_list'), +urlpatterns_events = [ + url(regex=r'^events/$', view=EventListView.as_view(), name='events_list'), url( - regex=r'^for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', + regex=r'^object/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/events/$', view=ObjectEventListView.as_view(), name='events_for_object' ), url( - regex=r'^by_verb/(?P[\w\-\.]+)/$', + regex=r'^verbs/(?P[\w\-\.]+)/$', view=VerbEventListView.as_view(), name='events_by_verb' ), - url( - regex=r'^notifications/(?P\d+)/mark_read/$', - view=NotificationMarkRead.as_view(), name='notification_mark_read' - ), - url( - regex=r'^notifications/all/mark_read/$', - view=NotificationMarkReadAll.as_view(), name='notification_mark_read_all' - ), url( regex=r'^user/events/$', name='current_user_events', view=CurrentUserEventListView.as_view() ), +] + +urlpatterns_notification = [ url( - regex=r'^user/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/subscriptions/$', - view=ObjectEventTypeSubscriptionListView.as_view(), - name='object_event_types_user_subcriptions_list' + regex=r'^user/notifications/$', view=NotificationListView.as_view(), + name='user_notifications_list' ), + url( + regex=r'^user/notifications/(?P\d+)/mark_read/$', + view=NotificationMarkRead.as_view(), name='notification_mark_read' + ), + url( + regex=r'^user/notifications/all/mark_read/$', + view=NotificationMarkReadAll.as_view(), name='notification_mark_read_all' + ), +] + +urlpatterns_subscriptions = [ url( regex=r'^user/event_types/subscriptions/$', view=EventTypeSubscriptionListView.as_view(), name='event_types_user_subcriptions_list' ), url( - regex=r'^user/notifications/$', view=NotificationListView.as_view(), - name='user_notifications_list' + regex=r'^user/object/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/subscriptions/$', + view=ObjectEventTypeSubscriptionListView.as_view(), + name='object_event_types_user_subcriptions_list' ), ] +urlpatterns = [] +urlpatterns.extend(urlpatterns_events) +urlpatterns.extend(urlpatterns_notification) +urlpatterns.extend(urlpatterns_subscriptions) + api_urls = [ url( regex=r'^event_type_namespaces/(?P[-\w]+)/$', diff --git a/mayan/apps/linking/urls.py b/mayan/apps/linking/urls.py index 6f4a75ffb5..f8a271b8fb 100644 --- a/mayan/apps/linking/urls.py +++ b/mayan/apps/linking/urls.py @@ -18,12 +18,12 @@ from .views import ( urlpatterns = [ url( - regex=r'^document/(?P\d+)/list/$', + regex=r'^documents/(?P\d+)/smart_links/$', view=DocumentSmartLinkListView.as_view(), name='smart_link_instances_for_document' ), url( - regex=r'^document/(?P\d+)/(?P\d+)/$', + regex=r'^documents/(?P\d+)/smart_links/(?P\d+)/$', view=ResolvedSmartLinkView.as_view(), name='smart_link_instance_view' ), url( @@ -32,46 +32,46 @@ urlpatterns = [ name='document_type_smart_links' ), url( - regex=r'^setup/list/$', view=SmartLinkListView.as_view(), + regex=r'^smart_links/$', view=SmartLinkListView.as_view(), name='smart_link_list' ), url( - regex=r'^setup/create/$', view=SmartLinkCreateView.as_view(), + regex=r'^smart_links/create/$', view=SmartLinkCreateView.as_view(), name='smart_link_create' ), url( - regex=r'^setup/(?P\d+)/delete/$', + regex=r'^smart_links/(?P\d+)/delete/$', view=SmartLinkDeleteView.as_view(), name='smart_link_delete' ), url( - regex=r'^setup/(?P\d+)/edit/$', view=SmartLinkEditView.as_view(), + regex=r'^smart_links/(?P\d+)/edit/$', view=SmartLinkEditView.as_view(), name='smart_link_edit' ), url( - regex=r'^setup/(?P\d+)/document_types/$', + regex=r'^smart_links/(?P\d+)/document_types/$', view=SetupSmartLinkDocumentTypesView.as_view(), name='smart_link_document_types' ), url( - regex=r'^setup/(?P\d+)/condition/list/$', + regex=r'^smart_links/(?P\d+)/conditions/$', view=SmartLinkConditionListView.as_view(), name='smart_link_condition_list' ), url( - regex=r'^setup/(?P\d+)/condition/create/$', + regex=r'^smart_links/(?P\d+)/conditions/create/$', view=SmartLinkConditionCreateView.as_view(), name='smart_link_condition_create' ), url( - regex=r'^setup/smart_link/condition/(?P\d+)/edit/$', - view=SmartLinkConditionEditView.as_view(), - name='smart_link_condition_edit' - ), - url( - regex=r'^setup/smart_link/condition/(?P\d+)/delete/$', + regex=r'^smart_links/conditions/(?P\d+)/delete/$', view=SmartLinkConditionDeleteView.as_view(), name='smart_link_condition_delete' ), + url( + regex=r'^smart_links/conditions/(?P\d+)/edit/$', + view=SmartLinkConditionEditView.as_view(), + name='smart_link_condition_edit' + ), ] api_urls = [ diff --git a/mayan/apps/mailer/urls.py b/mayan/apps/mailer/urls.py index 5f6ab328e5..08b9effb02 100644 --- a/mayan/apps/mailer/urls.py +++ b/mayan/apps/mailer/urls.py @@ -11,19 +11,19 @@ from .views import ( urlpatterns = [ url( - regex=r'^(?P\d+)/send/link/$', view=MailDocumentLinkView.as_view(), + regex=r'^documents/(?P\d+)/send/link/$', view=MailDocumentLinkView.as_view(), name='send_document_link' ), url( - regex=r'^multiple/send/link/$', view=MailDocumentLinkView.as_view(), + regex=r'^documents/multiple/send/link/$', view=MailDocumentLinkView.as_view(), name='send_multiple_document_link' ), url( - regex=r'^(?P\d+)/send/document/$', view=MailDocumentView.as_view(), + regex=r'^documents/(?P\d+)/send/document/$', view=MailDocumentView.as_view(), name='send_document' ), url( - regex=r'^multiple/send/document/$', view=MailDocumentView.as_view(), + regex=r'^documents/multiple/send/document/$', view=MailDocumentView.as_view(), name='send_multiple_document' ), url( diff --git a/mayan/apps/mayan_statistics/urls.py b/mayan/apps/mayan_statistics/urls.py index 424991df20..369077df81 100644 --- a/mayan/apps/mayan_statistics/urls.py +++ b/mayan/apps/mayan_statistics/urls.py @@ -8,17 +8,17 @@ from .views import ( ) urlpatterns = [ - url(regex=r'^$', view=NamespaceListView.as_view(), name='namespace_list'), + url(regex=r'^namespace/$', view=NamespaceListView.as_view(), name='namespace_list'), url( - regex=r'^namespace/(?P[\w-]+)/details/$', + regex=r'^namespaces/(?P[\w-]+)/$', view=NamespaceDetailView.as_view(), name='namespace_details' ), url( - regex=r'^(?P[\w-]+)/view/$', view=StatisticDetailView.as_view(), + regex=r'^statistics/(?P[\w-]+)/view/$', view=StatisticDetailView.as_view(), name='statistic_detail' ), url( - regex=r'^(?P[\w-]+)/queue/$', view=StatisticQueueView.as_view(), + regex=r'^statistics/(?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 05bcbfd638..5b7879c0ad 100644 --- a/mayan/apps/metadata/urls.py +++ b/mayan/apps/metadata/urls.py @@ -17,56 +17,56 @@ from .views import ( urlpatterns = [ url( - regex=r'^(?P\d+)/edit/$', view=DocumentMetadataEditView.as_view(), + regex=r'^documents/metadata/(?P\d+)/edit/$', view=DocumentMetadataEditView.as_view(), name='metadata_edit' ), url( - regex=r'^multiple/edit/$', view=DocumentMetadataEditView.as_view(), + regex=r'^documents/multiple/metadata/edit/$', view=DocumentMetadataEditView.as_view(), name='metadata_multiple_edit' ), url( - regex=r'^(?P\d+)/view/$', view=DocumentMetadataListView.as_view(), + regex=r'^documents/(?P\d+)/view/$', view=DocumentMetadataListView.as_view(), name='metadata_view' ), url( - regex=r'^(?P\d+)/add/$', view=DocumentMetadataAddView.as_view(), + regex=r'^documents/(?P\d+)/add/$', view=DocumentMetadataAddView.as_view(), name='metadata_add' ), url( - regex=r'^multiple/add/$', view=DocumentMetadataAddView.as_view(), + regex=r'^documents/multiple/add/$', view=DocumentMetadataAddView.as_view(), name='metadata_multiple_add' ), url( - regex=r'^(?P\d+)/remove/$', + regex=r'^documents/(?P\d+)/remove/$', view=DocumentMetadataRemoveView.as_view(), name='metadata_remove' ), url( - regex=r'^multiple/remove/$', view=DocumentMetadataRemoveView.as_view(), + regex=r'^documents/multiple/remove/$', view=DocumentMetadataRemoveView.as_view(), name='metadata_multiple_remove' ), url( - regex=r'^setup/type/list/$', view=MetadataTypeListView.as_view(), + regex=r'^metadata_types/$', view=MetadataTypeListView.as_view(), name='setup_metadata_type_list' ), url( - regex=r'^setup/type/create/$', view=MetadataTypeCreateView.as_view(), + regex=r'^metadata_types/create/$', view=MetadataTypeCreateView.as_view(), name='setup_metadata_type_create' ), url( - regex=r'^setup/type/(?P\d+)/edit/$', + regex=r'^metadata_types/(?P\d+)/edit/$', view=MetadataTypeEditView.as_view(), name='setup_metadata_type_edit' ), url( - regex=r'^setup/type/(?P\d+)/delete/$', + regex=r'^metadata_types/(?P\d+)/delete/$', view=MetadataTypeDeleteView.as_view(), name='setup_metadata_type_delete' ), url( - regex=r'^setup/document_types/(?P\d+)/metadata_types/$', + regex=r'^document_types/(?P\d+)/metadata_types/$', view=SetupDocumentTypeMetadataTypes.as_view(), name='setup_document_type_metadata_types' ), url( - regex=r'^setup/metadata_types/(?P\d+)/document_types/$', + regex=r'^metadata_types/(?P\d+)/document_types/$', view=SetupMetadataTypesDocumentTypes.as_view(), name='setup_metadata_type_document_types' ), diff --git a/mayan/apps/motd/urls.py b/mayan/apps/motd/urls.py index f1d4dae73e..06e463cb63 100644 --- a/mayan/apps/motd/urls.py +++ b/mayan/apps/motd/urls.py @@ -8,18 +8,18 @@ from .views import ( ) urlpatterns = [ - url(regex=r'^list/$', view=MessageListView.as_view(), name='message_list'), + url(regex=r'^messages/$', view=MessageListView.as_view(), name='message_list'), url( - regex=r'^create/$', view=MessageCreateView.as_view(), + regex=r'^messages/create/$', view=MessageCreateView.as_view(), name='message_create' ), url( - regex=r'^(?P\d+)/edit/$', view=MessageEditView.as_view(), - name='message_edit' + regex=r'^messages/(?P\d+)/delete/$', view=MessageDeleteView.as_view(), + name='message_delete' ), url( - regex=r'^(?P\d+)/delete/$', view=MessageDeleteView.as_view(), - name='message_delete' + regex=r'^messages/(?P\d+)/edit/$', view=MessageEditView.as_view(), + name='message_edit' ), ] diff --git a/mayan/apps/ocr/urls.py b/mayan/apps/ocr/urls.py index a56543baba..4a250a2766 100644 --- a/mayan/apps/ocr/urls.py +++ b/mayan/apps/ocr/urls.py @@ -13,19 +13,6 @@ from .views import ( ) urlpatterns = [ - url( - regex=r'^documents/pages/(?P\d+)/content/$', - view=DocumentPageOCRContentView.as_view(), - name='document_page_ocr_content' - ), - url( - regex=r'^documents/(?P\d+)/content/$', - view=DocumentOCRContentView.as_view(), name='document_ocr_content' - ), - url( - regex=r'^documents/(?P\d+)/submit/$', - view=DocumentSubmitView.as_view(), name='document_submit' - ), url( regex=r'^document_types/submit/$', view=DocumentTypeSubmitView.as_view(), name='document_type_submit' @@ -39,6 +26,19 @@ urlpatterns = [ view=DocumentTypeSettingsEditView.as_view(), name='document_type_ocr_settings' ), + url( + regex=r'^documents/pages/(?P\d+)/content/$', + view=DocumentPageOCRContentView.as_view(), + name='document_page_ocr_content' + ), + url( + regex=r'^documents/(?P\d+)/content/$', + view=DocumentOCRContentView.as_view(), name='document_ocr_content' + ), + url( + regex=r'^documents/(?P\d+)/submit/$', + view=DocumentSubmitView.as_view(), name='document_submit' + ), url( regex=r'^documents/(?P\d+)/ocr/errors/$', view=DocumentOCRErrorsListView.as_view(), @@ -48,7 +48,7 @@ urlpatterns = [ regex=r'^documents/(?P\d+)/ocr/download/$', view=DocumentOCRDownloadView.as_view(), name='document_ocr_download' ), - url(regex=r'^all/$', view=EntryListView.as_view(), name='entry_list'), + url(regex=r'^logs/$', view=EntryListView.as_view(), name='entry_list'), ] api_urls = [ diff --git a/mayan/apps/permissions/urls.py b/mayan/apps/permissions/urls.py index 3cf84ecfcd..5ab95f277a 100644 --- a/mayan/apps/permissions/urls.py +++ b/mayan/apps/permissions/urls.py @@ -10,30 +10,30 @@ from .views import ( urlpatterns = [ url( - regex=r'^group/(?P\d+)/roles/$', + regex=r'^groups/(?P\d+)/roles/$', view=GroupRolesView.as_view(), name='group_roles' ), - url(regex=r'^role/list/$', view=RoleListView.as_view(), name='role_list'), + url(regex=r'^roles/$', view=RoleListView.as_view(), name='role_list'), url( - regex=r'^role/create/$', view=RoleCreateView.as_view(), + regex=r'^roles/create/$', view=RoleCreateView.as_view(), name='role_create' ), url( - 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(), + regex=r'^roles/(?P\d+)/delete/$', view=RoleDeleteView.as_view(), name='role_delete' ), url( - regex=r'^role/(?P\d+)/groups/$', + regex=r'^roles/(?P\d+)/edit/$', view=RoleEditView.as_view(), + name='role_edit' + ), + url( + regex=r'^roles/(?P\d+)/groups/$', view=SetupRoleMembersView.as_view(), name='role_groups' ), + url( + regex=r'^roles/(?P\d+)/permissions/$', + view=SetupRolePermissionsView.as_view(), name='role_permissions' + ), ] api_urls = [ diff --git a/mayan/apps/sources/urls.py b/mayan/apps/sources/urls.py index 8796f632df..fdc7adc330 100644 --- a/mayan/apps/sources/urls.py +++ b/mayan/apps/sources/urls.py @@ -15,59 +15,59 @@ from .wizards import DocumentCreateWizard urlpatterns = [ url( - regex=r'^staging_file/(?P\d+)/(?P.+)/delete/$', + regex=r'^staging_files/(?P\d+)/(?P.+)/delete/$', view=StagingFileDeleteView.as_view(), name='staging_file_delete' ), + + # Document create views + url( - regex=r'^upload/document/new/interactive/(?P\d+)/$', + regex=r'^documents/create/from/local/multiple/$', + view=DocumentCreateWizard.as_view(), name='document_create_multiple' + ), + url( + regex=r'^documents/upload/new/interactive/(?P\d+)/$', view=UploadInteractiveView.as_view(), name='upload_interactive' ), url( - regex=r'^upload/document/new/interactive/$', + regex=r'^documents/upload/new/interactive/$', view=UploadInteractiveView.as_view(), name='upload_interactive' ), url( - regex=r'^upload/document/(?P\d+)/version/interactive/(?P\d+)/$', + regex=r'^documents/(?P\d+)/versions/upload/interactive/(?P\d+)/$', view=UploadInteractiveVersionView.as_view(), name='upload_version' ), url( - regex=r'^upload/document/(?P\d+)/version/interactive/$', + regex=r'^documents/(?P\d+)/versions/upload/interactive/$', view=UploadInteractiveVersionView.as_view(), name='upload_version' ), # Setup views url( - regex=r'^setup/list/$', view=SetupSourceListView.as_view(), + regex=r'^sources/$', view=SetupSourceListView.as_view(), name='setup_source_list' ), url( - regex=r'^setup/(?P\d+)/edit/$', view=SetupSourceEditView.as_view(), + regex=r'^sources/(?P\d+)/edit/$', view=SetupSourceEditView.as_view(), name='setup_source_edit' ), url( - regex=r'^setup/(?P\d+)/logs/$', view=SourceLogListView.as_view(), + regex=r'^sources/(?P\d+)/logs/$', view=SourceLogListView.as_view(), name='setup_source_logs' ), url( - regex=r'^setup/(?P\d+)/delete/$', + regex=r'^sources/(?P\d+)/delete/$', view=SetupSourceDeleteView.as_view(), name='setup_source_delete' ), url( - regex=r'^setup/(?P\w+)/create/$', + regex=r'^sources/(?P\w+)/create/$', view=SetupSourceCreateView.as_view(), name='setup_source_create' ), url( - regex=r'^setup/(?P\d+)/check/$', + regex=r'^sources/(?P\d+)/check/$', view=SetupSourceCheckView.as_view(), name='setup_source_check' ), - - # Document create views - - url( - regex=r'^create/from/local/multiple/$', - view=DocumentCreateWizard.as_view(), name='document_create_multiple' - ), ] api_urls = [ diff --git a/mayan/apps/tags/urls.py b/mayan/apps/tags/urls.py index 61fb5d1e3c..51ef7c340c 100644 --- a/mayan/apps/tags/urls.py +++ b/mayan/apps/tags/urls.py @@ -13,44 +13,44 @@ from .views import ( ) urlpatterns = [ - url(regex=r'^list/$', view=TagListView.as_view(), name='tag_list'), - url(regex=r'^create/$', view=TagCreateView.as_view(), name='tag_create'), + url(regex=r'^tags/$', view=TagListView.as_view(), name='tag_list'), + url(regex=r'^tags/create/$', view=TagCreateView.as_view(), name='tag_create'), url( - regex=r'^(?P\d+)/delete/$', view=TagDeleteActionView.as_view(), + regex=r'^tags/(?P\d+)/delete/$', view=TagDeleteActionView.as_view(), name='tag_delete' ), url( - regex=r'^(?P\d+)/edit/$', view=TagEditView.as_view(), + regex=r'^tags/(?P\d+)/edit/$', view=TagEditView.as_view(), name='tag_edit' ), url( - regex=r'^(?P\d+)/documents/$', view=TagDocumentListView.as_view(), + regex=r'^tags/(?P\d+)/documents/$', view=TagDocumentListView.as_view(), name='tag_document_list' ), url( - regex=r'^multiple/delete/$', view=TagDeleteActionView.as_view(), + regex=r'^tags/multiple/delete/$', view=TagDeleteActionView.as_view(), name='tag_multiple_delete' ), url( - regex=r'^multiple/remove/document/(?P\d+)/$', + regex=r'^documents/(?P\d+)/tags/remove/$', view=TagRemoveActionView.as_view(), name='single_document_multiple_tag_remove' ), url( - regex=r'^multiple/remove/document/multiple/$', + regex=r'^documents/multiple/tags/remove/$', view=TagRemoveActionView.as_view(), name='multiple_documents_selection_tag_remove' ), url( - regex=r'^selection/attach/document/(?P\d+)/$', + regex=r'^documents/(?P\d+)/tags/attach/$', view=TagAttachActionView.as_view(), name='tag_attach' ), url( - regex=r'^selection/attach/document/multiple/$', + regex=r'^documents/multiple/tags/attach/$', view=TagAttachActionView.as_view(), name='multiple_documents_tag_attach' ), url( - regex=r'^document/(?P\d+)/tags/$', + regex=r'^documents/(?P\d+)/tags/$', view=DocumentTagListView.as_view(), name='document_tag_list' ), ] diff --git a/mayan/apps/user_management/urls.py b/mayan/apps/user_management/urls.py index aa22e65206..9f8a36047b 100644 --- a/mayan/apps/user_management/urls.py +++ b/mayan/apps/user_management/urls.py @@ -26,22 +26,22 @@ urlpatterns_current_user = [ urlpatterns_groups = [ url( - regex=r'^group/list/$', view=GroupListView.as_view(), name='group_list' + regex=r'^groups/$', view=GroupListView.as_view(), name='group_list' ), url( - regex=r'^group/create/$', view=GroupCreateView.as_view(), + regex=r'^groups/create/$', view=GroupCreateView.as_view(), name='group_create' ), url( - regex=r'^group/(?P\d+)/edit/$', view=GroupEditView.as_view(), - name='group_edit' - ), - url( - regex=r'^group/(?P\d+)/delete/$', view=GroupDeleteView.as_view(), + regex=r'^groups/(?P\d+)/delete/$', view=GroupDeleteView.as_view(), name='group_delete' ), url( - regex=r'^group/(?P\d+)/users/$', view=GroupUsersView.as_view(), + regex=r'^groups/(?P\d+)/edit/$', view=GroupEditView.as_view(), + name='group_edit' + ), + url( + regex=r'^groups/(?P\d+)/users/$', view=GroupUsersView.as_view(), name='group_members' ) ]