diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py index 4cfbaf20dd..c7bffbba1c 100644 --- a/mayan/apps/documents/apps.py +++ b/mayan/apps/documents/apps.py @@ -154,6 +154,16 @@ class DocumentsApp(MayanAppConfig): func=lambda context: two_state_template(context['object'].enabled) ) + SourceColumn( + source=DeletedDocument, label=_('Thumbnail'), + func=lambda context: document_thumbnail( + context['object'], + gallery_name='documents:delete_document_list', + size=setting_thumbnail_size.value, + title=getattr(context['object'], 'label', None), + disable_title_link=True + ) + ) SourceColumn( source=DeletedDocument, label=_('Type'), attribute='document_type' ) diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index 1f76df5d6c..cbf3abbfe7 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -685,7 +685,7 @@ def document_multiple_document_type_edit(request): # TODO: Get rid of this view and convert widget to use API and base64 only images def get_document_image(request, document_id, size=setting_preview_size.value): - document = get_object_or_404(Document, pk=document_id) + document = get_object_or_404(Document.passthrough, pk=document_id) try: Permission.check_permissions(request.user, (permission_document_view,)) except PermissionDenied: diff --git a/mayan/apps/documents/widgets.py b/mayan/apps/documents/widgets.py index 216d548ddf..f0e8a71dfc 100644 --- a/mayan/apps/documents/widgets.py +++ b/mayan/apps/documents/widgets.py @@ -94,7 +94,7 @@ def document_link(document): ) -def document_html_widget(document_page, click_view=None, click_view_arguments=None, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION, gallery_name=None, fancybox_class='fancybox', image_class='lazy-load', title=None, size=setting_thumbnail_size.value, nolazyload=False, post_load_class=None): +def document_html_widget(document_page, click_view=None, click_view_arguments=None, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION, gallery_name=None, fancybox_class='fancybox', image_class='lazy-load', title=None, size=setting_thumbnail_size.value, nolazyload=False, post_load_class=None, disable_title_link=False): result = [] alt_text = _('Document page image') @@ -131,10 +131,15 @@ def document_html_widget(document_page, click_view=None, click_view_arguments=No ) if title: - preview_click_link = document.get_absolute_url() - title_template = 'data-caption="{title}"'.format( - title=strip_tags(title), url=preview_click_link or '#' - ) + if not disable_title_link: + preview_click_link = document.get_absolute_url() + title_template = 'data-caption="{title}"'.format( + title=strip_tags(title), url=preview_click_link or '#' + ) + else: + title_template = 'data-caption="{title}"'.format( + title=strip_tags(title), + ) else: title_template = ''