From 2ce05287122a2950e520b1db1d5ae9a8fafb8be9 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 10 Jun 2019 03:50:22 -0400 Subject: [PATCH] Only search pages for documents not in trash Signed-off-by: Roberto Rosario --- mayan/apps/documents/search.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mayan/apps/documents/search.py b/mayan/apps/documents/search.py index 9f0ce7871c..5d7457f861 100644 --- a/mayan/apps/documents/search.py +++ b/mayan/apps/documents/search.py @@ -1,5 +1,6 @@ from __future__ import absolute_import, unicode_literals +from django.apps import apps from django.utils.translation import ugettext_lazy as _ from mayan.apps.common.literals import LIST_MODE_CHOICE_ITEM @@ -12,6 +13,14 @@ def format_uuid(term_string): return term_string.replace('-', '') +def get_queryset_page_search_queryset(): + # Ignore documents in trash can + DocumentPage = apps.get_model( + app_label='documents', model_name='DocumentPage' + ) + return DocumentPage.objects.filter(document_version__document__in_trash=False) + + document_search = SearchModel( app_label='documents', list_mode=LIST_MODE_CHOICE_ITEM, model_name='Document', permission=permission_document_view, @@ -36,6 +45,7 @@ document_search.add_model_field( document_page_search = SearchModel( app_label='documents', list_mode=LIST_MODE_CHOICE_ITEM, model_name='DocumentPage', permission=permission_document_view, + queryset=get_queryset_page_search_queryset, serializer_path='mayan.apps.documents.serializers.DocumentPageSerializer' )