From a9a66391b62e03cb929dbdb400fc419b1a5c4c86 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 15 Aug 2018 03:47:03 -0400 Subject: [PATCH] Hide the title link of documents in the trash. Signed-off-by: Roberto Rosario --- HISTORY.rst | 1 + mayan/apps/documents/views/document_views.py | 39 ++++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index e7b099154d..f9a2a01fc9 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -31,6 +31,7 @@ - Remove the pending work chapter. This is now available in the Wiki: wiki.mayan-edms.com - Add support for hiding a links icon. Hide all object menu links' icons. +- Hide the title link of documents in the trash. 3.0.1 (2018-07-08) ================= diff --git a/mayan/apps/documents/views/document_views.py b/mayan/apps/documents/views/document_views.py index f2e7e6cbc9..e21ccd83fb 100644 --- a/mayan/apps/documents/views/document_views.py +++ b/mayan/apps/documents/views/document_views.py @@ -68,25 +68,6 @@ class DocumentListView(SingleObjectListView): return self.get_document_queryset().filter(is_stub=False) -class DeletedDocumentListView(DocumentListView): - object_permission = None - - def get_document_queryset(self): - return AccessControlList.objects.filter_by_access( - permission_document_view, self.request.user, - queryset=DeletedDocument.trash.all() - ) - - def get_extra_context(self): - context = super(DeletedDocumentListView, self).get_extra_context() - context.update( - { - 'title': _('Documents in trash'), - } - ) - return context - - class DeletedDocumentDeleteView(ConfirmView): extra_context = { 'title': _('Delete the selected document?') @@ -125,6 +106,26 @@ class DeletedDocumentDeleteManyView(MultipleInstanceActionMixin, DeletedDocument success_message_plural = '%(count)d documents deleted.' +class DeletedDocumentListView(DocumentListView): + object_permission = None + + def get_document_queryset(self): + return AccessControlList.objects.filter_by_access( + permission_document_view, self.request.user, + queryset=DeletedDocument.trash.all() + ) + + def get_extra_context(self): + context = super(DeletedDocumentListView, self).get_extra_context() + context.update( + { + 'hide_link': True, + 'title': _('Documents in trash'), + } + ) + return context + + class DocumentDocumentTypeEditView(MultipleObjectFormActionView): form_class = DocumentTypeSelectForm model = Document