matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup SourceColumn invocations

Browse Source 
Update the code of some SourceColumn invocations to be model methods
instead of lambda wapped functions.

Move the translated labels to the models too.

Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2018-12-21 23:47:14 -04:00
parent 5623f0b3a4
commit 213f3c1fb4
7 changed files with 109 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
mayan/apps/documents/apps.py
View File

@@ -237,107 +237,94 @@ class DocumentsApp(MayanAppConfig):
# Document
SourceColumn(
source=Document, label=_('Thumbnail'),
func=lambda context: document_page_thumbnail_widget.render(
instance=context['object']
)
), label=_('Thumbnail'), source=Document
)
SourceColumn(
source=Document, attribute='document_type'
attribute='document_type', label=_('Type'), source=Document
)
SourceColumn(
source=Document, label=_('Pages'),
func=lambda context: widget_document_page_number(
document=context['object']
)
func=widget_document_page_number, label=_('Pages'), source=Document
)
# DocumentPage
SourceColumn(
source=DocumentPage, label=_('Thumbnail'),
func=lambda context: document_page_thumbnail_widget.render(
instance=context['object']
)
), label=_('Thumbnail'), source=DocumentPage
)
SourceColumn(
source=DocumentPageSearchResult, label=_('Thumbnail'),
func=lambda context: document_page_thumbnail_widget.render(
instance=context['object']
)
), label=_('Thumbnail'), source=DocumentPageSearchResult
)
SourceColumn(
source=DocumentPageSearchResult, label=_('Type'),
attribute='document_version.document.document_type'
attribute='document_version.document.document_type',
label=_('Type'), source=DocumentPageSearchResult
)
# DocumentType
SourceColumn(
source=DocumentType, label=_('Documents'),
func=lambda context: context['object'].get_document_count(
user=context['request'].user
)
), label=_('Documents'), source=DocumentType
)
SourceColumn(
source=DocumentTypeFilename, label=_('Enabled'),
func=lambda context: TwoStateWidget(
state=context['object'].enabled
).render()
).render(), label=_('Enabled'), source=DocumentTypeFilename
)
# DeletedDocument
SourceColumn(
source=DeletedDocument, label=_('Thumbnail'),
func=lambda context: document_page_thumbnail_widget.render(
instance=context['object']
)
), label=_('Thumbnail'), source=DeletedDocument
)
SourceColumn(
source=DeletedDocument, attribute='document_type'
attribute='document_type', source=DeletedDocument
)
SourceColumn(
source=DeletedDocument, attribute='deleted_date_time'
attribute='deleted_date_time', source=DeletedDocument
)
# DocumentVersion
SourceColumn(
source=DocumentVersion, label=_('Thumbnail'),
func=lambda context: document_page_thumbnail_widget.render(
instance=context['object']
)
), label=_('Thumbnail'), source=DocumentVersion
)
SourceColumn(
source=DocumentVersion, attribute='timestamp'
attribute='timestamp', source=DocumentVersion
)
SourceColumn(
source=DocumentVersion, label=_('Pages'),
func=lambda context: widget_document_version_page_number(
document_version=context['object']
)
func=widget_document_version_page_number, label=_('Pages'),
source=DocumentVersion
)
SourceColumn(
source=DocumentVersion, attribute='mimetype'
attribute='mimetype', source=DocumentVersion
)
SourceColumn(
source=DocumentVersion, attribute='encoding'
attribute='encoding', source=DocumentVersion
)
SourceColumn(
source=DocumentVersion, attribute='comment'
attribute='comment', source=DocumentVersion
)
# DuplicatedDocument
SourceColumn(
source=DuplicatedDocument, label=_('Thumbnail'),
func=lambda context: document_page_thumbnail_widget.render(
instance=context['object'].document
)
), label=_('Thumbnail'), source=DuplicatedDocument
)
SourceColumn(
source=DuplicatedDocument, label=_('Duplicates'),
func=lambda context: context['object'].documents.count()
func=lambda context: context['object'].documents.count(),
label=_('Duplicates'), source=DuplicatedDocument
)
app.conf.beat_schedule.update(