Remove usage of url.patterns as per Django's deprecation warnings.
This commit is contained in:
@@ -1,13 +1,12 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import (
|
||||
ACLCreateView, ACLDeleteView, ACLListView, ACLPermissionsView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/create/$',
|
||||
ACLCreateView.as_view(), name='acl_create'
|
||||
@@ -21,4 +20,4 @@ urlpatterns = patterns(
|
||||
r'^(?P<pk>\d+)/permissions/$', ACLPermissionsView.as_view(),
|
||||
name='acl_permissions'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
from django.contrib.auth.views import (
|
||||
logout, password_reset, password_reset_confirm, password_reset_complete,
|
||||
password_reset_done
|
||||
@@ -10,8 +10,7 @@ from django.contrib.auth.views import (
|
||||
from .views import login_view, password_change_done, password_change_view
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^login/$', login_view, name='login_view'),
|
||||
url(
|
||||
r'^password/change/done/$', password_change_done,
|
||||
@@ -21,10 +20,9 @@ urlpatterns = patterns(
|
||||
r'^password/change/$', password_change_view,
|
||||
name='password_change_view'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
urlpatterns += patterns(
|
||||
'',
|
||||
urlpatterns += [
|
||||
url(
|
||||
r'^logout/$', logout, {'next_page': settings.LOGIN_REDIRECT_URL},
|
||||
name='logout_view'
|
||||
@@ -53,4 +51,4 @@ urlpatterns += patterns(
|
||||
password_reset_done, {
|
||||
'template_name': 'appearance/password_reset_done.html'
|
||||
}, name='password_reset_done_view'),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import APICheckedoutDocumentListView, APICheckedoutDocumentView
|
||||
from .views import (
|
||||
@@ -8,8 +8,7 @@ from .views import (
|
||||
DocumentCheckinView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^list/$', CheckoutListView.as_view(), name='checkout_list'),
|
||||
url(
|
||||
r'^(?P<pk>\d+)/check/out/$', CheckoutDocumentView.as_view(),
|
||||
@@ -23,10 +22,9 @@ urlpatterns = patterns(
|
||||
r'^(?P<pk>\d+)/check/info/$', CheckoutDetailView.as_view(),
|
||||
name='checkout_info'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(
|
||||
r'^documents/$', APICheckedoutDocumentListView.as_view(),
|
||||
name='checkout-document-list'
|
||||
@@ -35,4 +33,4 @@ api_urls = patterns(
|
||||
r'^documents/(?P<pk>[0-9]+)/$', APICheckedoutDocumentView.as_view(),
|
||||
name='checkedout-document-view'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
from django.contrib.staticfiles.templatetags.staticfiles import static
|
||||
from django.views.generic import RedirectView
|
||||
from django.views.i18n import javascript_catalog, set_language
|
||||
@@ -13,8 +13,7 @@ from .views import (
|
||||
multi_object_action_view
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
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'),
|
||||
@@ -52,10 +51,9 @@ urlpatterns = patterns(
|
||||
r'^filter/(?P<slug>[\w-]+)/results/$', FilterResultListView.as_view(),
|
||||
name='filter_results'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
urlpatterns += patterns(
|
||||
'',
|
||||
urlpatterns += [
|
||||
url(
|
||||
r'^favicon\.ico$', RedirectView.as_view(
|
||||
permanent=True, url=static('appearance/images/favicon.ico')
|
||||
@@ -68,4 +66,4 @@ urlpatterns += patterns(
|
||||
url(
|
||||
r'^set_language/$', set_language, name='set_language'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import (
|
||||
TransformationCreateView, TransformationDeleteView, TransformationEditView,
|
||||
TransformationListView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^create_for/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/$',
|
||||
TransformationCreateView.as_view(), name='transformation_create'
|
||||
@@ -25,4 +24,4 @@ urlpatterns = patterns(
|
||||
r'^edit/(?P<pk>\d+)/$', TransformationEditView.as_view(),
|
||||
name='transformation_edit'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import (
|
||||
KeyDeleteView, KeyDetailView, KeyDownloadView, KeyQueryView,
|
||||
@@ -8,8 +8,7 @@ from .views import (
|
||||
PublicKeyListView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^(?P<pk>\d+)/$', KeyDetailView.as_view(), name='key_detail'
|
||||
),
|
||||
@@ -38,4 +37,4 @@ urlpatterns = patterns(
|
||||
url(
|
||||
r'^receive/(?P<key_id>.+)/$', KeyReceive.as_view(), name='key_receive'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import (
|
||||
DocumentCommentCreateView, DocumentCommentDeleteView,
|
||||
DocumentCommentListView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^comment/(?P<pk>\d+)/delete/$', DocumentCommentDeleteView.as_view(),
|
||||
name='comment_delete'
|
||||
@@ -21,4 +20,4 @@ urlpatterns = patterns(
|
||||
r'^(?P<pk>\d+)/comment/list/$',
|
||||
DocumentCommentListView.as_view(), name='comments_for_document'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import (
|
||||
APIDocumentIndexListView, APIIndexListView,
|
||||
@@ -15,8 +15,7 @@ from .views import (
|
||||
TemplateNodeDeleteView, TemplateNodeEditView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^setup/index/list/$', SetupIndexListView.as_view(),
|
||||
name='index_setup_list'
|
||||
@@ -69,10 +68,9 @@ urlpatterns = patterns(
|
||||
r'^list/for/document/(?P<pk>\d+)/$',
|
||||
DocumentIndexNodeListView.as_view(), name='document_index_list'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(
|
||||
r'^index/node/(?P<pk>[0-9]+)/documents/$',
|
||||
APIIndexNodeInstanceDocumentListView.as_view(),
|
||||
@@ -95,4 +93,4 @@ api_urls = patterns(
|
||||
r'^document/(?P<pk>[0-9]+)/indexes/$',
|
||||
APIDocumentIndexListView.as_view(), name='document-index-list'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import (
|
||||
AllDocumentSignatureVerifyView, DocumentVersionDetachedSignatureCreateView,
|
||||
@@ -10,8 +10,7 @@ from .views import (
|
||||
DocumentVersionSignatureUploadView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^(?P<pk>\d+)/details/$',
|
||||
DocumentVersionSignatureDetailView.as_view(),
|
||||
@@ -52,4 +51,4 @@ urlpatterns = patterns(
|
||||
AllDocumentSignatureVerifyView.as_view(),
|
||||
name='all_document_version_signature_verify'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import (
|
||||
DocumentWorkflowInstanceListView, SetupWorkflowCreateView,
|
||||
@@ -14,8 +14,7 @@ from .views import (
|
||||
WorkflowInstanceTransitionView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^document/(?P<pk>\d+)/workflows/$',
|
||||
DocumentWorkflowInstanceListView.as_view(),
|
||||
@@ -96,4 +95,4 @@ urlpatterns = patterns(
|
||||
SetupWorkflowTransitionEditView.as_view(),
|
||||
name='setup_workflow_transition_edit'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import (
|
||||
APIDeletedDocumentListView, APIDeletedDocumentRestoreView,
|
||||
@@ -36,8 +36,7 @@ from .views import (
|
||||
)
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^list/$', DocumentListView.as_view(), name='document_list'),
|
||||
url(
|
||||
r'^list/recent/$', RecentDocumentListView.as_view(),
|
||||
@@ -247,10 +246,9 @@ urlpatterns = patterns(
|
||||
DocumentTypeFilenameCreateView.as_view(),
|
||||
name='document_type_filename_create'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(
|
||||
r'^trashed_documents/$', APIDeletedDocumentListView.as_view(),
|
||||
name='trasheddocument-list'
|
||||
@@ -313,4 +311,4 @@ api_urls = patterns(
|
||||
r'^document_types/$', APIDocumentTypeListView.as_view(),
|
||||
name='documenttype-list'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import APIAdvancedSearchView, APISearchView
|
||||
from .views import (
|
||||
AdvancedSearchView, ResultsView, SearchAgainView, SearchView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^(?P<search_model>[\.\w]+)/$', SearchView.as_view(), name='search'),
|
||||
url(
|
||||
r'^advanced/(?P<search_model>[\.\w]+)/$', AdvancedSearchView.as_view(),
|
||||
@@ -22,10 +21,9 @@ urlpatterns = patterns(
|
||||
r'^results/(?P<search_model>[\.\w]+)/$', ResultsView.as_view(),
|
||||
name='results'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(
|
||||
r'^search/(?P<search_model>[\.\w]+)/$', APISearchView.as_view(),
|
||||
name='search-view'
|
||||
@@ -34,4 +32,4 @@ api_urls = patterns(
|
||||
r'^advanced/(?P<search_model>[\.\w]+)/$', APIAdvancedSearchView.as_view(),
|
||||
name='advanced-search-view'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import EventListView, ObjectEventListView, VerbEventListView
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^all/$', EventListView.as_view(), name='events_list'),
|
||||
url(
|
||||
r'^for/(?P<app_label>[-\w]+)/(?P<model>[-\w]+)/(?P<object_id>\d+)/$',
|
||||
@@ -15,4 +14,4 @@ urlpatterns = patterns(
|
||||
r'^by_verb/(?P<verb>[\w\-]+)/$', VerbEventListView.as_view(),
|
||||
name='events_by_verb'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import (
|
||||
APIDocumentFolderListView, APIFolderDocumentListView,
|
||||
@@ -12,8 +12,7 @@ from .views import (
|
||||
folder_add_multiple_documents, folder_document_multiple_remove
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^list/$', FolderListView.as_view(), name='folder_list'),
|
||||
url(r'^create/$', FolderCreateView.as_view(), name='folder_create'),
|
||||
url(r'^(?P<pk>\d+)/edit/$', FolderEditView.as_view(), name='folder_edit'),
|
||||
@@ -40,10 +39,9 @@ urlpatterns = patterns(
|
||||
r'^document/(?P<pk>\d+)/folder/list/$',
|
||||
DocumentFolderListView.as_view(), name='document_folder_list'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(
|
||||
r'^folders/(?P<folder_pk>[0-9]+)/documents/(?P<pk>[0-9]+)/$',
|
||||
APIFolderDocumentView.as_view(), name='folder-document'
|
||||
@@ -61,4 +59,4 @@ api_urls = patterns(
|
||||
r'^document/(?P<pk>[0-9]+)/folders/$',
|
||||
APIDocumentFolderListView.as_view(), name='document-folder-list'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import (
|
||||
DocumentSmartLinkListView, ResolvedSmartLinkView,
|
||||
@@ -10,8 +10,7 @@ from .views import (
|
||||
SmartLinkEditView, SmartLinkListView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^document/(?P<pk>\d+)/list/$', DocumentSmartLinkListView.as_view(),
|
||||
name='smart_link_instances_for_document'
|
||||
@@ -60,4 +59,4 @@ urlpatterns = patterns(
|
||||
SmartLinkConditionDeleteView.as_view(),
|
||||
name='smart_link_condition_delete'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import LogEntryListView, send_document_link
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^(?P<document_id>\d+)/send/link/$', send_document_link,
|
||||
name='send_document_link'
|
||||
@@ -17,4 +16,4 @@ urlpatterns = patterns(
|
||||
url(
|
||||
r'^log/$', LogEntryListView.as_view(), name='error_log'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import (
|
||||
APIDocumentMetadataListView, APIDocumentMetadataView,
|
||||
@@ -18,8 +18,7 @@ from .views import (
|
||||
metadata_remove
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^(?P<document_id>\d+)/edit/$', metadata_edit, name='metadata_edit'
|
||||
),
|
||||
@@ -72,10 +71,9 @@ urlpatterns = patterns(
|
||||
SetupDocumentTypeMetadataRequiredView.as_view(),
|
||||
name='setup_document_type_metadata_required'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(
|
||||
r'^metadata_types/$', APIMetadataTypeListView.as_view(),
|
||||
name='metadatatype-list'
|
||||
@@ -107,4 +105,4 @@ api_urls = patterns(
|
||||
APIDocumentTypeMetadataTypeView.as_view(),
|
||||
name='documenttypemetadatatype-detail'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import (
|
||||
MessageCreateView, MessageDeleteView, MessageEditView, MessageListView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^list/$', MessageListView.as_view(), name='message_list'),
|
||||
url(r'^create/$', MessageCreateView.as_view(), name='message_create'),
|
||||
url(
|
||||
@@ -17,4 +16,4 @@ urlpatterns = patterns(
|
||||
r'^(?P<pk>\d+)/delete/$', MessageDeleteView.as_view(),
|
||||
name='message_delete'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import (
|
||||
APIDocumentOCRView, APIDocumentPageContentView, APIDocumentVersionOCRView
|
||||
@@ -11,8 +11,7 @@ from .views import (
|
||||
DocumentTypeSubmitView, EntryListView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^(?P<pk>\d+)/content/$', DocumentOCRContent.as_view(),
|
||||
name='document_content'
|
||||
@@ -40,10 +39,9 @@ urlpatterns = patterns(
|
||||
),
|
||||
|
||||
url(r'^all/$', EntryListView.as_view(), name='entry_list'),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(
|
||||
r'^document/(?P<pk>\d+)/submit/$', APIDocumentOCRView.as_view(),
|
||||
name='document-ocr-submit-view'
|
||||
@@ -57,4 +55,4 @@ api_urls = patterns(
|
||||
r'^page/(?P<pk>\d+)/content/$', APIDocumentPageContentView.as_view(),
|
||||
name='document-page-content-view'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import APIRoleListView, APIRoleView
|
||||
from .views import (
|
||||
@@ -8,8 +8,7 @@ from .views import (
|
||||
SetupRoleMembersView, SetupRolePermissionsView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^role/list/$', RoleListView.as_view(), name='role_list'),
|
||||
url(r'^role/create/$', RoleCreateView.as_view(), name='role_create'),
|
||||
url(
|
||||
@@ -25,10 +24,9 @@ urlpatterns = patterns(
|
||||
r'^role/(?P<pk>\d+)/members/$', SetupRoleMembersView.as_view(),
|
||||
name='role_members'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(r'^roles/$', APIRoleListView.as_view(), name='role-list'),
|
||||
url(r'^roles/(?P<pk>[0-9]+)/$', APIRoleView.as_view(), name='role-detail'),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import include, patterns, url
|
||||
from django.conf.urls import include, url
|
||||
from django.conf import settings
|
||||
from django.utils.module_loading import import_string
|
||||
|
||||
@@ -46,7 +46,6 @@ class APIEndPoint(object):
|
||||
def register_urls(self, urlpatterns):
|
||||
from .urls import urlpatterns as app_urls
|
||||
|
||||
app_urls += patterns(
|
||||
'',
|
||||
app_urls += [
|
||||
url(r'^%s/' % (self.name or self.app.name), include(urlpatterns)),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,20 +1,18 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import APIBase, APIAppView, BrowseableObtainAuthToken
|
||||
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
)
|
||||
urlpatterns = [
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(r'^$', APIBase.as_view(), name='api_root'),
|
||||
url(r'^api/(?P<path>.*)/?$', APIAppView.as_view(), name='api_app'),
|
||||
url(
|
||||
r'^auth/token/obtain/$', BrowseableObtainAuthToken.as_view(),
|
||||
name='auth_token_obtain'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import NamespaceDetailView, NamespaceListView
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^namespace/all/$', NamespaceListView.as_view(),
|
||||
name='namespace_list'
|
||||
@@ -14,4 +13,4 @@ urlpatterns = patterns(
|
||||
r'^namespace/(?P<namespace_name>\w+)/$',
|
||||
NamespaceDetailView.as_view(), name='namespace_detail'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import (
|
||||
APIStagingSourceFileView, APIStagingSourceFileImageView,
|
||||
@@ -13,8 +13,7 @@ from .views import (
|
||||
)
|
||||
from .wizards import DocumentCreateWizard
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(
|
||||
r'^staging_file/(?P<pk>\d+)/(?P<encoded_filename>.+)/delete/$',
|
||||
StagingFileDeleteView.as_view(), name='staging_file_delete'
|
||||
@@ -67,10 +66,9 @@ urlpatterns = patterns(
|
||||
r'^create/from/local/multiple/$', DocumentCreateWizard.as_view(),
|
||||
name='document_create_multiple'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(
|
||||
r'^staging_folders/file/(?P<staging_folder_pk>[0-9]+)/(?P<encoded_filename>.+)/image/$',
|
||||
APIStagingSourceFileImageView.as_view(),
|
||||
@@ -88,4 +86,4 @@ api_urls = patterns(
|
||||
r'^staging_folders/(?P<pk>[0-9]+)/$', APIStagingSourceView.as_view(),
|
||||
name='stagingfolder-detail'
|
||||
)
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .views import (
|
||||
NamespaceDetailView, NamespaceListView, StatisticDetailView,
|
||||
StatisticQueueView
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^$', NamespaceListView.as_view(), name='namespace_list'),
|
||||
url(
|
||||
r'^namespace/(?P<slug>[\w-]+)/details/$',
|
||||
@@ -22,4 +21,4 @@ urlpatterns = patterns(
|
||||
r'^(?P<slug>[\w-]+)/queue/$', StatisticQueueView.as_view(),
|
||||
name='statistic_queue'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import (
|
||||
APIDocumentTagView, APIDocumentTagListView, APITagDocumentListView,
|
||||
@@ -13,8 +13,7 @@ from .views import (
|
||||
single_document_multiple_tag_remove
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^list/$', TagListView.as_view(), name='tag_list'),
|
||||
url(r'^create/$', TagCreateView.as_view(), name='tag_create'),
|
||||
url(r'^(?P<tag_id>\d+)/delete/$', tag_delete, name='tag_delete'),
|
||||
@@ -51,10 +50,9 @@ urlpatterns = patterns(
|
||||
r'^document/(?P<pk>\d+)/tags/$', DocumentTagListView.as_view(),
|
||||
name='document_tags'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(
|
||||
r'^tags/(?P<pk>[0-9]+)/documents/$', APITagDocumentListView.as_view(),
|
||||
name='tag-document-list'
|
||||
@@ -69,4 +67,4 @@ api_urls = patterns(
|
||||
r'^document/(?P<document_pk>[0-9]+)/tags/(?P<pk>[0-9]+)/$',
|
||||
APIDocumentTagView.as_view(), name='document-tag'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
|
||||
from .api_views import (
|
||||
APICurrentUserView, APIGroupListView, APIGroupView, APIUserListView,
|
||||
@@ -13,8 +13,7 @@ from .views import (
|
||||
user_set_password
|
||||
)
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^group/list/$', GroupListView.as_view(), name='group_list'),
|
||||
url(r'^group/add/$', GroupCreateView.as_view(), name='group_add'),
|
||||
url(
|
||||
@@ -50,10 +49,9 @@ urlpatterns = patterns(
|
||||
r'^user/(?P<pk>\d+)/groups/$', UserGroupsView.as_view(),
|
||||
name='user_groups'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
api_urls = patterns(
|
||||
'',
|
||||
api_urls = [
|
||||
url(r'^groups/$', APIGroupListView.as_view(), name='group-list'),
|
||||
url(
|
||||
r'^groups/(?P<pk>[0-9]+)/$', APIGroupView.as_view(),
|
||||
@@ -64,4 +62,4 @@ api_urls = patterns(
|
||||
url(
|
||||
r'^users/current/$', APICurrentUserView.as_view(), name='user-current'
|
||||
),
|
||||
)
|
||||
]
|
||||
|
||||
@@ -1,28 +1,27 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.conf import settings
|
||||
from django.conf.urls import include, patterns, url
|
||||
from django.conf.urls import include, url
|
||||
from django.contrib import admin
|
||||
|
||||
admin.autodiscover()
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
url(r'^docs/', include('rest_framework_swagger.urls')),
|
||||
)
|
||||
]
|
||||
|
||||
if settings.DEBUG:
|
||||
from django.conf.urls.static import static
|
||||
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
|
||||
|
||||
if 'rosetta' in settings.INSTALLED_APPS:
|
||||
urlpatterns += patterns(
|
||||
'',
|
||||
url(r'^rosetta/', include('rosetta.urls'), name='rosetta'))
|
||||
urlpatterns += [
|
||||
url(r'^rosetta/', include('rosetta.urls'), name='rosetta')
|
||||
]
|
||||
|
||||
if 'debug_toolbar' in settings.INSTALLED_APPS:
|
||||
import debug_toolbar
|
||||
urlpatterns += patterns(
|
||||
'',
|
||||
url(r'^__debug__/', include(debug_toolbar.urls)))
|
||||
urlpatterns += [
|
||||
url(r'^__debug__/', include(debug_toolbar.urls))
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user