diff --git a/mayan/apps/document_parsing/apps.py b/mayan/apps/document_parsing/apps.py index 037b785065..6cf75e8417 100644 --- a/mayan/apps/document_parsing/apps.py +++ b/mayan/apps/document_parsing/apps.py @@ -16,7 +16,6 @@ from mayan.apps.common import ( from mayan.apps.common.classes import ModelAttribute, ModelField from mayan.apps.documents.search import document_page_search, document_search from mayan.apps.documents.signals import post_version_upload -from mayan.apps.documents.widgets import document_link from mayan.apps.navigation import SourceColumn from mayan.celery import app @@ -112,16 +111,17 @@ class DocumentParsingApp(MayanAppConfig): ) SourceColumn( - source=DocumentVersionParseError, label=_('Document'), - func=lambda context: document_link(context['object'].document_version.document) + attribute='document_version__document', is_absolute_url=True, + is_identifier=True, is_sortable=True, + source=DocumentVersionParseError ) SourceColumn( - source=DocumentVersionParseError, label=_('Added'), - attribute='datetime_submitted' + attribute='datetime_submitted', is_sortable=True, + label=_('Date and time'), source=DocumentVersionParseError ) SourceColumn( - source=DocumentVersionParseError, label=_('Result'), - attribute='result' + attribute='result', label=_('Result'), + source=DocumentVersionParseError ) app.conf.task_queues.append( diff --git a/mayan/apps/documents/widgets.py b/mayan/apps/documents/widgets.py index 7496043e6d..11cea2bead 100644 --- a/mayan/apps/documents/widgets.py +++ b/mayan/apps/documents/widgets.py @@ -68,9 +68,3 @@ class DocumentPageThumbnailWidget(object): 'size_thumbnail_height': setting_thumbnail_height.value, } ) - - -def document_link(document): - return mark_safe('%s' % ( - document.get_absolute_url(), document) - ) diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py index 816247ea21..9335cf81bd 100644 --- a/mayan/apps/ocr/apps.py +++ b/mayan/apps/ocr/apps.py @@ -16,7 +16,6 @@ from mayan.apps.common import ( from mayan.apps.common.classes import ModelAttribute, ModelField from mayan.apps.documents.search import document_search, document_page_search from mayan.apps.documents.signals import post_version_upload -from mayan.apps.documents.widgets import document_link from mayan.apps.navigation import SourceColumn from mayan.celery import app @@ -110,13 +109,12 @@ class OCRApp(MayanAppConfig): ) SourceColumn( - func=lambda context: document_link( - context['object'].document_version.document - ), label=_('Document'), source=DocumentVersionOCRError + attribute='document_version__document', is_absolute_url=True, + is_identifier=True, is_sortable=True, source=DocumentVersionOCRError ) SourceColumn( - attribute='datetime_submitted', label=_('Date and time'), - source=DocumentVersionOCRError + attribute='datetime_submitted', is_sortable=True, + label=_('Date and time'), source=DocumentVersionOCRError ) SourceColumn( attribute='result', source=DocumentVersionOCRError