diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py index 450131ad28..2f65a0d70d 100644 --- a/mayan/apps/documents/apps.py +++ b/mayan/apps/documents/apps.py @@ -93,7 +93,8 @@ from .statistics import ( ) from .widgets import ( DocumentThumbnailWidget, DocumentPageThumbnailWidget, - DocumentVersionThumbnailWidget + DocumentVersionThumbnailWidget, widget_document_page_number, + widget_document_version_page_number ) @@ -195,6 +196,12 @@ class DocumentsApp(MayanAppConfig): SourceColumn( source=Document, label=_('Type'), attribute='document_type' ) + SourceColumn( + source=Document, label=_('Pages'), + func=lambda context: widget_document_page_number( + document=context['object'] + ) + ) # DocumentPage SourceColumn( @@ -246,10 +253,22 @@ class DocumentsApp(MayanAppConfig): ) # DocumentVersion + SourceColumn( + source=DocumentVersion, label=_('Thumbnail'), + func=lambda context: document_version_thumbnail_widget.render( + instance=context['object'] + ) + ) SourceColumn( source=DocumentVersion, label=_('Time and date'), attribute='timestamp' ) + SourceColumn( + source=DocumentVersion, label=_('Pages'), + func=lambda context: widget_document_version_page_number( + document_version=context['object'] + ) + ) SourceColumn( source=DocumentVersion, label=_('MIME type'), attribute='mimetype' @@ -262,12 +281,6 @@ class DocumentsApp(MayanAppConfig): source=DocumentVersion, label=_('Comment'), attribute='comment' ) - SourceColumn( - source=DocumentVersion, label=_('Thumbnail'), - func=lambda context: document_version_thumbnail_widget.render( - instance=context['object'] - ) - ) # DuplicatedDocument SourceColumn( diff --git a/mayan/apps/documents/widgets.py b/mayan/apps/documents/widgets.py index 9e6d961bc5..eefa9ebc38 100644 --- a/mayan/apps/documents/widgets.py +++ b/mayan/apps/documents/widgets.py @@ -392,3 +392,11 @@ class InteractiveDocumentPageWidget(BaseDocumentThumbnailWidget): return super( InteractiveDocumentPageWidget, self ).render(instance=instance, *args, **kwargs) + + +def widget_document_page_number(document): + return mark_safe(s=_('Pages: %d') % document.pages.count()) + + +def widget_document_version_page_number(document_version): + return mark_safe(s=_('Pages: %d') % document_version.pages.count())