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

Cleanup empty instance nodes in the same task not as a separate task

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-05 14:08:33 -04:00
parent c195f74310
commit 6737a87021
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/document_indexing/__init__.py
View File

@@ -29,13 +29,11 @@ def document_index_delete(sender, **kwargs):
@receiver(post_save, dispatch_uid='document_metadata_index_update', sender=DocumentMetadata) @receiver(post_save, dispatch_uid='document_metadata_index_update', sender=DocumentMetadata)
def document_metadata_index_update(sender, **kwargs): def document_metadata_index_update(sender, **kwargs):
task_index_document.apply_async(kwargs=dict(document_id=kwargs['instance'].document.pk), queue='indexing') task_index_document.apply_async(kwargs=dict(document_id=kwargs['instance'].document.pk), queue='indexing')
task_delete_empty_index_nodes.apply_async(queue='indexing')
@receiver(post_delete, dispatch_uid='document_metadata_index_post_delete', sender=DocumentMetadata) @receiver(post_delete, dispatch_uid='document_metadata_index_post_delete', sender=DocumentMetadata)
def document_metadata_index_post_delete(sender, **kwargs): def document_metadata_index_post_delete(sender, **kwargs):
task_index_document.apply_async(kwargs=dict(document_id=kwargs['instance'].document.pk), queue='indexing') task_index_document.apply_async(kwargs=dict(document_id=kwargs['instance'].document.pk), queue='indexing')
task_delete_empty_index_nodes.apply_async(queue='indexing')
register_maintenance_links([rebuild_index_instances], namespace='document_indexing', title=_(u'Indexes')) register_maintenance_links([rebuild_index_instances], namespace='document_indexing', title=_(u'Indexes'))

2
mayan/apps/document_indexing/api.py
View File

@@ -24,6 +24,8 @@ def index_document(document):
for index_node in IndexInstanceNode.objects.filter(documents=document): for index_node in IndexInstanceNode.objects.filter(documents=document):
index_node.documents.remove(document) index_node.documents.remove(document)
delete_empty_index_nodes()
# Only update indexes where the document type is found or that do not have any document type specified # Only update indexes where the document type is found or that do not have any document type specified
# TODO: explicit document type selection, none != all # TODO: explicit document type selection, none != all
for index in Index.objects.filter(Q(enabled=True) & (Q(document_types=None) | Q(document_types=document.document_type))): for index in Index.objects.filter(Q(enabled=True) & (Q(document_types=None) | Q(document_types=document.document_type))):