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

Add support to fully delete documents from trash can. Rename previous delete link and related code to 'move to trash'. gh-issue #188.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-03 18:35:10 -04:00
parent 98b988038e
commit 3e299f030a
7 changed files with 95 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,9 @@ from .api_views import (
)
from .settings import setting_print_size, setting_display_size
from .views import (
DeletedDocumentListView, DocumentListView, DocumentManyRestoreView,
DocumentPageListView, DocumentRestoreView, RecentDocumentListView
DeletedDocumentDeleteView, DeletedDocumentListView, DocumentListView,
DocumentManyDeleteView, DocumentManyRestoreView, DocumentPageListView,
DocumentRestoreView, RecentDocumentListView
)
urlpatterns = patterns(
@@ -25,10 +26,12 @@ urlpatterns = patterns(
url(r'^(?P<document_id>\d+)/properties/$', 'document_properties', name='document_properties'),
url(r'^(?P<pk>\d+)/restore/$', DocumentRestoreView.as_view(), name='document_restore'),
url(r'^multiple/restore/$', DocumentManyRestoreView.as_view(), name='document_multiple_restore'),
url(r'^(?P<pk>\d+)/delete/$', DeletedDocumentDeleteView.as_view(), name='document_delete'),
url(r'^multiple/delete/$', DocumentManyDeleteView.as_view(), name='document_multiple_delete'),
url(r'^(?P<document_id>\d+)/type/$', 'document_document_type_edit', name='document_document_type_edit'),
url(r'^multiple/type/$', 'document_multiple_document_type_edit', name='document_multiple_document_type_edit'),
url(r'^(?P<document_id>\d+)/delete/$', 'document_delete', name='document_delete'),
url(r'^multiple/delete/$', 'document_multiple_delete', name='document_multiple_delete'),
url(r'^(?P<document_id>\d+)/trash/$', 'document_trash', name='document_trash'),
url(r'^multiple/trash/$', 'document_multiple_trash', name='document_multiple_trash'),
url(r'^(?P<document_id>\d+)/edit/$', 'document_edit', name='document_edit'),
url(r'^(?P<document_id>\d+)/print/$', 'document_print', name='document_print'),
url(r'^(?P<document_id>\d+)/reset_page_count/$', 'document_update_page_count', name='document_update_page_count'),