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

Move code to calculate an index descendant node instances to the model, catch exception when index is still not initialized, possible cause of issue #28

Browse Source
This commit is contained in:
Roberto Rosario
2012-10-07 04:19:16 -04:00
parent 8b52c4a99a
commit aa2e32e801
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/document_indexing/models.py
View File

@@ -53,6 +53,12 @@ class Index(models.Model):
def natural_key(self): def natural_key(self):
return (self.name,) return (self.name,)
def get_instance_node_count(self):
try:
return self.instance_root.get_descendant_count()
except IndexInstanceNode.DoesNotExist:
return 0
class Meta: class Meta:
verbose_name = _(u'index') verbose_name = _(u'index')
verbose_name_plural = _(u'indexes') verbose_name_plural = _(u'indexes')

2
apps/document_indexing/views.py
View File

@@ -310,7 +310,7 @@ def index_list(request):
'title': _(u'indexes'), 'title': _(u'indexes'),
'hide_links': True, 'hide_links': True,
'extra_columns': [ 'extra_columns': [
{'name': _(u'nodes'), 'attribute': encapsulate(lambda x: x.instance_root.get_descendant_count())}, {'name': _(u'nodes'), 'attribute': 'get_instance_node_count'},
{'name': _(u'document types'), 'attribute': 'get_document_types_names'}, {'name': _(u'document types'), 'attribute': 'get_document_types_names'},
], ],
} }