matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update all mention of "deleted documents" to "trashed documents" in the document app API. GitLab issue #276.

Browse Source
This commit is contained in:
Roberto Rosario
2016-05-10 19:02:31 -04:00
parent 5a15a34818
commit 6dcbd62c15
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mayan/apps/documents/api_views.py
View File

@@ -39,7 +39,7 @@ logger = logging.getLogger(__name__)
class APIDeletedDocumentListView(generics.ListAPIView):
"""
Returns a list of all the deleted documents.
Returns a list of all the trashed documents.
"""
filter_backends = (MayanObjectPermissionsFilter,)
@@ -51,7 +51,7 @@ class APIDeletedDocumentListView(generics.ListAPIView):
class APIDeletedDocumentView(generics.RetrieveDestroyAPIView):
"""
Returns the selected deleted document details.
Returns the selected trashed document details.
"""
mayan_object_permissions = {
@@ -63,7 +63,7 @@ class APIDeletedDocumentView(generics.RetrieveDestroyAPIView):
def delete(self, *args, **kwargs):
"""
Delete the selected document.
Delete the trashed document.
"""
return super(APIDeletedDocumentView, self).delete(*args, **kwargs)
@@ -71,7 +71,7 @@ class APIDeletedDocumentView(generics.RetrieveDestroyAPIView):
class APIDeletedDocumentRestoreView(generics.GenericAPIView):
"""
Restore a deleted document.
Restore a trashed document.
"""
mayan_object_permissions = {

12
mayan/apps/documents/urls.py
View File

@@ -243,16 +243,16 @@ urlpatterns = patterns(
api_urls = patterns(
'',
url(
r'^deleted_documents/$', APIDeletedDocumentListView.as_view(),
name='deleteddocument-list'
r'^trashed_documents/$', APIDeletedDocumentListView.as_view(),
name='trasheddocument-list'
),
url(
r'^deleted_documents/(?P<pk>[0-9]+)/$',
APIDeletedDocumentView.as_view(), name='deleteddocument-detail'
r'^trashed_documents/(?P<pk>[0-9]+)/$',
APIDeletedDocumentView.as_view(), name='trasheddocument-detail'
),
url(
r'^deleted_documents/(?P<pk>[0-9]+)/restore/$',
APIDeletedDocumentRestoreView.as_view(), name='deleteddocument-restore'
r'^trashed_documents/(?P<pk>[0-9]+)/restore/$',
APIDeletedDocumentRestoreView.as_view(), name='trasheddocument-restore'
),
url(r'^documents/$', APIDocumentListView.as_view(), name='document-list'),
url(