diff --git a/mayan/apps/acls/urls.py b/mayan/apps/acls/urls.py index f68cc5e0b8..4da8a6d7fc 100644 --- a/mayan/apps/acls/urls.py +++ b/mayan/apps/acls/urls.py @@ -7,7 +7,7 @@ from .views import ( ) urlpatterns = patterns( - 'acls.views', + '', url( r'^(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/create/$', ACLCreateView.as_view(), name='acl_create' diff --git a/mayan/apps/authentication/urls.py b/mayan/apps/authentication/urls.py index dfeaaaa05a..9f9f948594 100644 --- a/mayan/apps/authentication/urls.py +++ b/mayan/apps/authentication/urls.py @@ -2,16 +2,23 @@ from __future__ import unicode_literals from django.conf import settings from django.conf.urls import patterns, url +from django.contrib.auth.views import ( + logout, password_reset, password_reset_confirm, password_reset_complete, + password_reset_done +) + +from .views import login_view, password_change_done, password_change_view + urlpatterns = patterns( - 'authentication.views', - url(r'^login/$', 'login_view', name='login_view'), + '', + url(r'^login/$', login_view, name='login_view'), url( - r'^password/change/done/$', 'password_change_done', + r'^password/change/done/$', password_change_done, name='password_change_done' ), url( - r'^password/change/$', 'password_change_view', + r'^password/change/$', password_change_view, name='password_change_view' ), ) @@ -19,12 +26,11 @@ urlpatterns = patterns( urlpatterns += patterns( '', url( - r'^logout/$', 'django.contrib.auth.views.logout', - {'next_page': settings.LOGIN_REDIRECT_URL}, name='logout_view' + r'^logout/$', logout, {'next_page': settings.LOGIN_REDIRECT_URL}, + name='logout_view' ), url( - r'^password/reset/$', 'django.contrib.auth.views.password_reset', - { + r'^password/reset/$', password_reset, { 'email_template_name': 'appearance/password_reset_email.html', 'template_name': 'appearance/password_reset_form.html', 'post_reset_redirect': '/password/reset/done' @@ -32,19 +38,19 @@ urlpatterns += patterns( ), url( r'^password/reset/confirm/(?P[0-9A-Za-z]+)-(?P.+)/$', - 'django.contrib.auth.views.password_reset_confirm', { + password_reset_confirm, { 'template_name': 'appearance/password_reset_confirm.html', 'post_reset_redirect': '/password/reset/complete/' }, name='password_reset_confirm_view' ), url( r'^password/reset/complete/$', - 'django.contrib.auth.views.password_reset_complete', { + password_reset_complete, { 'template_name': 'appearance/password_reset_complete.html' }, name='password_reset_complete_view'), url( r'^password/reset/done/$', - 'django.contrib.auth.views.password_reset_done', { + password_reset_done, { 'template_name': 'appearance/password_reset_done.html' }, name='password_reset_done_view'), ) diff --git a/mayan/apps/checkouts/urls.py b/mayan/apps/checkouts/urls.py index dd192954ff..c9b3a61bd3 100644 --- a/mayan/apps/checkouts/urls.py +++ b/mayan/apps/checkouts/urls.py @@ -9,7 +9,7 @@ from .views import ( ) urlpatterns = patterns( - 'checkouts.views', + '', url(r'^list/$', CheckoutListView.as_view(), name='checkout_list'), url( r'^(?P\d+)/check/out/$', CheckoutDocumentView.as_view(), diff --git a/mayan/apps/common/urls.py b/mayan/apps/common/urls.py index 11b6e1acf8..cef19076a8 100644 --- a/mayan/apps/common/urls.py +++ b/mayan/apps/common/urls.py @@ -3,23 +3,27 @@ from __future__ import unicode_literals from django.conf.urls import patterns, url from django.contrib.staticfiles.templatetags.staticfiles import static from django.views.generic import RedirectView -from django.views.i18n import javascript_catalog +from django.views.i18n import javascript_catalog, set_language from .views import ( AboutView, CurrentUserDetailsView, CurrentUserEditView, CurrentUserLocaleProfileDetailsView, CurrentUserLocaleProfileEditView, FilterResultListView, FilterSelectView, HomeView, LicenseView, - PackagesLicensesView, SetupListView, ToolsListView + PackagesLicensesView, SetupListView, ToolsListView, + multi_object_action_view ) urlpatterns = patterns( - 'common.views', + '', url(r'^$', HomeView.as_view(), name='home'), url(r'^about/$', AboutView.as_view(), name='about_view'), url(r'^license/$', LicenseView.as_view(), name='license_view'), - url(r'^packages/licenses/$', PackagesLicensesView.as_view(), name='packages_licenses_view'), url( - r'^object/multiple/action/$', 'multi_object_action_view', + r'^packages/licenses/$', PackagesLicensesView.as_view(), + name='packages_licenses_view' + ), + url( + r'^object/multiple/action/$', multi_object_action_view, name='multi_object_action_view' ), url(r'^setup/$', SetupListView.as_view(), name='setup_list'), @@ -62,7 +66,6 @@ urlpatterns += patterns( name='javascript_catalog' ), url( - r'^set_language/$', 'django.views.i18n.set_language', - name='set_language' + r'^set_language/$', set_language, name='set_language' ), ) diff --git a/mayan/apps/converter/urls.py b/mayan/apps/converter/urls.py index d1f6da99b7..60604f077d 100644 --- a/mayan/apps/converter/urls.py +++ b/mayan/apps/converter/urls.py @@ -8,7 +8,7 @@ from .views import ( ) urlpatterns = patterns( - 'converter.views', + '', url( r'^create_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', TransformationCreateView.as_view(), name='transformation_create' diff --git a/mayan/apps/django_gpg/urls.py b/mayan/apps/django_gpg/urls.py index 929e613e71..be6e3f68a1 100644 --- a/mayan/apps/django_gpg/urls.py +++ b/mayan/apps/django_gpg/urls.py @@ -9,7 +9,7 @@ from .views import ( ) urlpatterns = patterns( - 'django_gpg.views', + '', url( r'^(?P\d+)/$', KeyDetailView.as_view(), name='key_detail' ), diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py index 57edb77275..1810e3a6b3 100644 --- a/mayan/apps/documents/urls.py +++ b/mayan/apps/documents/urls.py @@ -25,11 +25,19 @@ from .views import ( DocumentTypeFilenameListView, DocumentTypeListView, DocumentTypeEditView, DocumentVersionDownloadFormView, DocumentVersionDownloadView, DocumentVersionListView, DocumentVersionRevertView, DocumentView, - EmptyTrashCanView, RecentDocumentListView + EmptyTrashCanView, RecentDocumentListView, document_clear_transformations, + document_document_type_edit, document_multiple_clear_transformations, + document_multiple_document_type_edit, document_multiple_update_page_count, + document_page_navigation_first, document_page_navigation_last, + document_page_navigation_next, document_page_navigation_previous, + document_page_rotate_left, document_page_rotate_right, + document_page_zoom_in, document_page_zoom_out, document_print, + document_update_page_count ) + urlpatterns = patterns( - 'documents.views', + '', url(r'^list/$', DocumentListView.as_view(), name='document_list'), url( r'^list/recent/$', RecentDocumentListView.as_view(), @@ -65,11 +73,11 @@ urlpatterns = patterns( name='document_multiple_delete' ), url( - r'^(?P\d+)/type/$', 'document_document_type_edit', + r'^(?P\d+)/type/$', document_document_type_edit, name='document_document_type_edit' ), url( - r'^multiple/type/$', 'document_multiple_document_type_edit', + r'^multiple/type/$', document_multiple_document_type_edit, name='document_multiple_document_type_edit' ), url( @@ -85,16 +93,15 @@ urlpatterns = patterns( name='document_edit' ), url( - r'^(?P\d+)/print/$', 'document_print', + 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' + document_update_page_count, name='document_update_page_count' ), url( - r'^multiple/reset_page_count/$', - 'document_multiple_update_page_count', + r'^multiple/reset_page_count/$', document_multiple_update_page_count, name='document_multiple_update_page_count' ), url( @@ -115,8 +122,7 @@ urlpatterns = patterns( ), url( r'^(?P\d+)/clear_transformations/$', - 'document_clear_transformations', - name='document_clear_transformations' + document_clear_transformations, name='document_clear_transformations' ), url( @@ -144,7 +150,7 @@ urlpatterns = patterns( url( r'^multiple/clear_transformations/$', - 'document_multiple_clear_transformations', + document_multiple_clear_transformations, name='document_multiple_clear_transformations' ), url( @@ -162,36 +168,36 @@ urlpatterns = patterns( ), url( r'^page/(?P\d+)/navigation/next/$', - 'document_page_navigation_next', name='document_page_navigation_next' + document_page_navigation_next, name='document_page_navigation_next' ), url( r'^page/(?P\d+)/navigation/previous/$', - 'document_page_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' + 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' + 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' + 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' + 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' + 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' + document_page_rotate_left, name='document_page_rotate_left' ), url( r'^page/(?P\d+)/reset/$', DocumentPageViewResetView.as_view(), diff --git a/mayan/apps/dynamic_search/urls.py b/mayan/apps/dynamic_search/urls.py index bcf566ca36..4087ee281d 100644 --- a/mayan/apps/dynamic_search/urls.py +++ b/mayan/apps/dynamic_search/urls.py @@ -8,7 +8,7 @@ from .views import ( ) urlpatterns = patterns( - 'dynamic_search.views', + '', url(r'^(?P[\.\w]+)/$', SearchView.as_view(), name='search'), url( r'^advanced/(?P[\.\w]+)/$', AdvancedSearchView.as_view(), diff --git a/mayan/apps/events/urls.py b/mayan/apps/events/urls.py index 3f87a57e58..f04ea071e5 100644 --- a/mayan/apps/events/urls.py +++ b/mayan/apps/events/urls.py @@ -5,7 +5,7 @@ from django.conf.urls import patterns, url from .views import EventListView, ObjectEventListView, VerbEventListView urlpatterns = patterns( - 'events.views', + '', url(r'^all/$', EventListView.as_view(), name='events_list'), url( r'^for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', diff --git a/mayan/apps/folders/urls.py b/mayan/apps/folders/urls.py index 9c0c5872e8..0b59d11486 100644 --- a/mayan/apps/folders/urls.py +++ b/mayan/apps/folders/urls.py @@ -8,11 +8,12 @@ from .api_views import ( ) from .views import ( DocumentFolderListView, FolderCreateView, FolderDeleteView, - FolderDetailView, FolderEditView, FolderListView + FolderDetailView, FolderEditView, FolderListView, folder_add_document, + folder_add_multiple_documents, folder_document_multiple_remove ) urlpatterns = patterns( - 'folders.views', + '', url(r'^list/$', FolderListView.as_view(), name='folder_list'), url(r'^create/$', FolderCreateView.as_view(), name='folder_create'), url(r'^(?P\d+)/edit/$', FolderEditView.as_view(), name='folder_edit'), @@ -23,16 +24,16 @@ urlpatterns = patterns( 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, name='folder_document_multiple_remove' ), url( r'^document/(?P\d+)/folder/add/$', - 'folder_add_document', name='folder_add_document' + folder_add_document, name='folder_add_document' ), url( - r'^document/multiple/folder/add/$', 'folder_add_multiple_documents', + r'^document/multiple/folder/add/$', folder_add_multiple_documents, name='folder_add_multiple_documents' ), url( diff --git a/mayan/apps/mailer/urls.py b/mayan/apps/mailer/urls.py index c32833bfac..49c42d953d 100644 --- a/mayan/apps/mailer/urls.py +++ b/mayan/apps/mailer/urls.py @@ -2,16 +2,16 @@ from __future__ import unicode_literals from django.conf.urls import patterns, url -from .views import LogEntryListView +from .views import LogEntryListView, send_document_link urlpatterns = patterns( - 'mailer.views', + '', url( - r'^(?P\d+)/send/link/$', 'send_document_link', + r'^(?P\d+)/send/link/$', send_document_link, name='send_document_link' ), url( - r'^(?P\d+)/send/document/$', 'send_document_link', + r'^(?P\d+)/send/document/$', send_document_link, {'as_attachment': True}, name='send_document' ), url( diff --git a/mayan/apps/metadata/urls.py b/mayan/apps/metadata/urls.py index b94acc25a3..b7779710de 100644 --- a/mayan/apps/metadata/urls.py +++ b/mayan/apps/metadata/urls.py @@ -13,33 +13,35 @@ from .views import ( DocumentMetadataListView, MetadataTypeCreateView, MetadataTypeDeleteView, MetadataTypeEditView, MetadataTypeListView, SetupDocumentTypeMetadataOptionalView, - SetupDocumentTypeMetadataRequiredView + SetupDocumentTypeMetadataRequiredView, metadata_add, metadata_edit, + metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove, + metadata_remove ) urlpatterns = patterns( - 'metadata.views', + '', url( - r'^(?P\d+)/edit/$', 'metadata_edit', name='metadata_edit' + r'^(?P\d+)/edit/$', metadata_edit, name='metadata_edit' ), url( r'^(?P\d+)/view/$', DocumentMetadataListView.as_view(), name='metadata_view' ), url( - r'^multiple/edit/$', 'metadata_multiple_edit', + r'^multiple/edit/$', metadata_multiple_edit, name='metadata_multiple_edit' ), - url(r'^(?P\d+)/add/$', 'metadata_add', name='metadata_add'), + url(r'^(?P\d+)/add/$', metadata_add, name='metadata_add'), url( - r'^multiple/add/$', 'metadata_multiple_add', + r'^multiple/add/$', metadata_multiple_add, name='metadata_multiple_add' ), url( - r'^(?P\d+)/remove/$', 'metadata_remove', + r'^(?P\d+)/remove/$', metadata_remove, name='metadata_remove' ), url( - r'^multiple/remove/$', 'metadata_multiple_remove', + r'^multiple/remove/$', metadata_multiple_remove, name='metadata_multiple_remove' ), diff --git a/mayan/apps/statistics/urls.py b/mayan/apps/statistics/urls.py index 3f568d6df4..1e1982c701 100644 --- a/mayan/apps/statistics/urls.py +++ b/mayan/apps/statistics/urls.py @@ -8,7 +8,7 @@ from .views import ( ) urlpatterns = patterns( - 'statistics.views', + '', url(r'^$', NamespaceListView.as_view(), name='namespace_list'), url( r'^namespace/(?P[\w-]+)/details/$', diff --git a/mayan/apps/tags/urls.py b/mayan/apps/tags/urls.py index 0ee9d5f19f..bb6dff9ccf 100644 --- a/mayan/apps/tags/urls.py +++ b/mayan/apps/tags/urls.py @@ -8,11 +8,13 @@ from .api_views import ( ) from .views import ( DocumentTagListView, TagCreateView, TagEditView, TagListView, - TagTaggedItemListView + TagTaggedItemListView, tag_attach, tag_multiple_attach, + tag_multiple_delete, multiple_documents_selection_tag_remove, + single_document_multiple_tag_remove ) urlpatterns = patterns( - 'tags.views', + '', url(r'^list/$', TagListView.as_view(), name='tag_list'), url(r'^create/$', TagCreateView.as_view(), name='tag_create'), url(r'^(?P\d+)/delete/$', 'tag_delete', name='tag_delete'), @@ -22,27 +24,26 @@ urlpatterns = patterns( name='tag_tagged_item_list' ), url( - r'^multiple/delete/$', 'tag_multiple_delete', - name='tag_multiple_delete' + 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, name='single_document_multiple_tag_remove' ), url( r'^multiple/remove/document/multiple/$', - 'multiple_documents_selection_tag_remove', + multiple_documents_selection_tag_remove, name='multiple_documents_selection_tag_remove' ), url( - r'^selection/attach/document/(?P\d+)/$', 'tag_attach', + r'^selection/attach/document/(?P\d+)/$', tag_attach, name='tag_attach' ), url( - r'^selection/attach/document/multiple/$', 'tag_multiple_attach', + r'^selection/attach/document/multiple/$', tag_multiple_attach, name='multiple_documents_tag_attach' ), diff --git a/mayan/apps/user_management/urls.py b/mayan/apps/user_management/urls.py index d56a45995d..26731722fc 100644 --- a/mayan/apps/user_management/urls.py +++ b/mayan/apps/user_management/urls.py @@ -8,11 +8,12 @@ from .api_views import ( ) from .views import ( GroupCreateView, GroupDeleteView, GroupEditView, GroupListView, - GroupMembersView, UserEditView, UserGroupsView, UserListView + GroupMembersView, UserEditView, UserGroupsView, UserListView, + user_multiple_delete, user_multiple_set_password, user_set_password ) urlpatterns = patterns( - 'user_management.views', + '', url(r'^group/list/$', GroupListView.as_view(), name='group_list'), url(r'^group/add/$', GroupCreateView.as_view(), name='group_add'), url( @@ -33,15 +34,15 @@ urlpatterns = patterns( url(r'^user/(?P\d+)/edit/$', UserEditView.as_view(), name='user_edit'), url(r'^user/(?P\d+)/delete/$', 'user_delete', name='user_delete'), url( - r'^user/multiple/delete/$', 'user_multiple_delete', + r'^user/multiple/delete/$', user_multiple_delete, name='user_multiple_delete' ), url( - r'^user/(?P\d+)/set_password/$', 'user_set_password', + r'^user/(?P\d+)/set_password/$', user_set_password, name='user_set_password' ), url( - r'^user/multiple/set_password/$', 'user_multiple_set_password', + r'^user/multiple/set_password/$', user_multiple_set_password, name='user_multiple_set_password' ), url(