From 77a3c103d17e78627248a728e007e96c2fbc2a46 Mon Sep 17 00:00:00 2001 From: Michael Price Date: Sun, 4 Mar 2018 04:22:46 -0400 Subject: [PATCH] Tweak app API urls. Signed-off-by: Michael Price --- mayan/apps/checkouts/urls.py | 2 +- mayan/apps/documents/urls.py | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mayan/apps/checkouts/urls.py b/mayan/apps/checkouts/urls.py index 59df498eb6..a2c44cc1f9 100644 --- a/mayan/apps/checkouts/urls.py +++ b/mayan/apps/checkouts/urls.py @@ -30,7 +30,7 @@ api_urls = [ name='checkout-document-list' ), url( - r'^documents/(?P[0-9]+)/checkout_info/$', APICheckedoutDocumentView.as_view(), + r'^checkouts/(?P[0-9]+)/checkout_info/$', APICheckedoutDocumentView.as_view(), name='checkedout-document-view' ), ] diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py index 1fe04436f7..6ae245f96e 100644 --- a/mayan/apps/documents/urls.py +++ b/mayan/apps/documents/urls.py @@ -279,11 +279,20 @@ urlpatterns = [ ] api_urls = [ - url(r'^documents/$', APIDocumentListView.as_view(), name='document-list'), url( - r'^documents/recent/$', APIRecentDocumentListView.as_view(), - name='document-recent-list' + r'^document_types/(?P[0-9]+)/$', APIDocumentTypeView.as_view(), + name='documenttype-detail' ), + url( + r'^document_types/$', APIDocumentTypeListView.as_view(), + name='documenttype-list' + ), + url( + r'^document_types/(?P[0-9]+)/documents/$', + APIDocumentTypeDocumentListView.as_view(), + name='documenttype-document-list' + ), + url(r'^documents/$', APIDocumentListView.as_view(), name='document-list'), url( r'^documents/(?P[0-9]+)/$', APIDocumentView.as_view(), name='document-detail' @@ -309,6 +318,10 @@ api_urls = [ APIDocumentVersionDownloadView.as_view(), name='documentversion-download' ), + url( + r'^documents/recent/$', APIRecentDocumentListView.as_view(), + name='document-recent-list' + ), url( r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/pages/(?P[0-9]+)$', APIDocumentPageView.as_view(), name='documentpage-detail' @@ -317,19 +330,6 @@ api_urls = [ r'^documents/(?P[0-9]+)/versions/(?P[0-9]+)/pages/(?P[0-9]+)/image/$', APIDocumentPageImageView.as_view(), name='documentpage-image' ), - url( - r'^document_types/(?P[0-9]+)/documents/$', - APIDocumentTypeDocumentListView.as_view(), - name='documenttype-document-list' - ), - url( - r'^document_types/(?P[0-9]+)/$', APIDocumentTypeView.as_view(), - name='documenttype-detail' - ), - url( - r'^document_types/$', APIDocumentTypeListView.as_view(), - name='documenttype-list' - ), url( r'^trashed_documents/$', APIDeletedDocumentListView.as_view(), name='trasheddocument-list'