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

46
mayan/apps/document_indexing/apps.py
View File

@@ -84,81 +84,75 @@ class DocumentIndexingApp(MayanAppConfig):
)
)
SourceColumn(source=Index, label=_('Label'), attribute='label')
SourceColumn(source=Index, label=_('Slug'), attribute='slug')
SourceColumn(attribute='label', is_identifier=True, source=Index)
SourceColumn(attribute='slug', source=Index)
SourceColumn(
source=Index, label=_('Enabled'),
func=lambda context: TwoStateWidget(
state=context['object'].enabled
).render()
).render(), label=_('Enabled'), source=Index
)
SourceColumn(
source=IndexInstance, label=_('Total levels'),
func=lambda context: context[
'object'
].instance_root.get_descendants_count()
].instance_root.get_descendants_count(), label=_('Total levels'),
source=IndexInstance,
)
SourceColumn(
source=IndexInstance, label=_('Total documents'),
func=lambda context: context[
'object'
].instance_root.get_descendants_document_count(
user=context['request'].user
)
), label=_('Total documents'), source=IndexInstance
)
SourceColumn(
source=IndexTemplateNode, label=_('Level'),
func=lambda context: node_level(context['object'])
func=lambda context: node_level(context['object']),
label=_('Level'), source=IndexTemplateNode
)
SourceColumn(
source=IndexTemplateNode, label=_('Enabled'),
func=lambda context: TwoStateWidget(
state=context['object'].enabled
).render()
).render(), label=_('Enabled'), source=IndexTemplateNode
)
SourceColumn(
source=IndexTemplateNode, label=_('Has document links?'),
func=lambda context: TwoStateWidget(
state=context['object'].link_documents
).render()
).render(), label=_('Has document links?'),
source=IndexTemplateNode,
)
SourceColumn(
source=IndexInstanceNode, label=_('Level'),
func=lambda context: index_instance_item_link(context['object'])
func=lambda context: index_instance_item_link(context['object']),
label=_('Level'), source=IndexInstanceNode
)
SourceColumn(
source=IndexInstanceNode, label=_('Levels'),
func=lambda context: context['object'].get_descendants_count()
func=lambda context: context['object'].get_descendants_count(),
label=_('Levels'), source=IndexInstanceNode
)
SourceColumn(
source=IndexInstanceNode, label=_('Documents'),
func=lambda context: context[
'object'
].get_descendants_document_count(
user=context['request'].user
)
), label=_('Documents'), source=IndexInstanceNode
)
SourceColumn(
source=DocumentIndexInstanceNode, label=_('Level'),
func=lambda context: get_instance_link(
index_instance_node=context['object'],
)
), label=_('Level'), source=DocumentIndexInstanceNode
)
SourceColumn(
source=DocumentIndexInstanceNode, label=_('Levels'),
func=lambda context: context['object'].get_descendants_count()
func=lambda context: context['object'].get_descendants_count(),
label=_('Levels'), source=DocumentIndexInstanceNode
)
SourceColumn(
source=DocumentIndexInstanceNode, label=_('Documents'),
func=lambda context: context[
'object'
].get_descendants_document_count(
user=context['request'].user
)
), label=_('Documents'), source=DocumentIndexInstanceNode
)
app.conf.task_queues.append(