Remove document_link widget
The SourceColumn class has now the ability to render a link's absolute_url, turn this on for the document parsing error and OCR error list columns and remove the document_link widget. Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
@@ -16,7 +16,6 @@ from mayan.apps.common import (
|
|||||||
from mayan.apps.common.classes import ModelAttribute, ModelField
|
from mayan.apps.common.classes import ModelAttribute, ModelField
|
||||||
from mayan.apps.documents.search import document_page_search, document_search
|
from mayan.apps.documents.search import document_page_search, document_search
|
||||||
from mayan.apps.documents.signals import post_version_upload
|
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.apps.navigation import SourceColumn
|
||||||
from mayan.celery import app
|
from mayan.celery import app
|
||||||
|
|
||||||
@@ -112,16 +111,17 @@ class DocumentParsingApp(MayanAppConfig):
|
|||||||
)
|
)
|
||||||
|
|
||||||
SourceColumn(
|
SourceColumn(
|
||||||
source=DocumentVersionParseError, label=_('Document'),
|
attribute='document_version__document', is_absolute_url=True,
|
||||||
func=lambda context: document_link(context['object'].document_version.document)
|
is_identifier=True, is_sortable=True,
|
||||||
|
source=DocumentVersionParseError
|
||||||
)
|
)
|
||||||
SourceColumn(
|
SourceColumn(
|
||||||
source=DocumentVersionParseError, label=_('Added'),
|
attribute='datetime_submitted', is_sortable=True,
|
||||||
attribute='datetime_submitted'
|
label=_('Date and time'), source=DocumentVersionParseError
|
||||||
)
|
)
|
||||||
SourceColumn(
|
SourceColumn(
|
||||||
source=DocumentVersionParseError, label=_('Result'),
|
attribute='result', label=_('Result'),
|
||||||
attribute='result'
|
source=DocumentVersionParseError
|
||||||
)
|
)
|
||||||
|
|
||||||
app.conf.task_queues.append(
|
app.conf.task_queues.append(
|
||||||
|
|||||||
@@ -68,9 +68,3 @@ class DocumentPageThumbnailWidget(object):
|
|||||||
'size_thumbnail_height': setting_thumbnail_height.value,
|
'size_thumbnail_height': setting_thumbnail_height.value,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def document_link(document):
|
|
||||||
return mark_safe('<a href="%s">%s</a>' % (
|
|
||||||
document.get_absolute_url(), document)
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ from mayan.apps.common import (
|
|||||||
from mayan.apps.common.classes import ModelAttribute, ModelField
|
from mayan.apps.common.classes import ModelAttribute, ModelField
|
||||||
from mayan.apps.documents.search import document_search, document_page_search
|
from mayan.apps.documents.search import document_search, document_page_search
|
||||||
from mayan.apps.documents.signals import post_version_upload
|
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.apps.navigation import SourceColumn
|
||||||
from mayan.celery import app
|
from mayan.celery import app
|
||||||
|
|
||||||
@@ -110,13 +109,12 @@ class OCRApp(MayanAppConfig):
|
|||||||
)
|
)
|
||||||
|
|
||||||
SourceColumn(
|
SourceColumn(
|
||||||
func=lambda context: document_link(
|
attribute='document_version__document', is_absolute_url=True,
|
||||||
context['object'].document_version.document
|
is_identifier=True, is_sortable=True, source=DocumentVersionOCRError
|
||||||
), label=_('Document'), source=DocumentVersionOCRError
|
|
||||||
)
|
)
|
||||||
SourceColumn(
|
SourceColumn(
|
||||||
attribute='datetime_submitted', label=_('Date and time'),
|
attribute='datetime_submitted', is_sortable=True,
|
||||||
source=DocumentVersionOCRError
|
label=_('Date and time'), source=DocumentVersionOCRError
|
||||||
)
|
)
|
||||||
SourceColumn(
|
SourceColumn(
|
||||||
attribute='result', source=DocumentVersionOCRError
|
attribute='result', source=DocumentVersionOCRError
|
||||||
|
|||||||
Reference in New Issue
Block a user