From 7c2ce7ce1feef28274996feff22cae4f1d2edde4 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 3 Jan 2015 12:33:50 -0400 Subject: [PATCH] Update task names, merge document metadata signales --- mayan/apps/document_indexing/__init__.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mayan/apps/document_indexing/__init__.py b/mayan/apps/document_indexing/__init__.py index 4c394b6183..4418d95bf5 100644 --- a/mayan/apps/document_indexing/__init__.py +++ b/mayan/apps/document_indexing/__init__.py @@ -18,7 +18,7 @@ from .links import (document_index_list, document_index_main_menu_link, rebuild_index_instances, template_node_create, template_node_delete, template_node_edit) from .models import Index, IndexTemplateNode, IndexInstanceNode -from .tasks import task_delete_empty_index_nodes, task_update_indexes +from .tasks import task_delete_empty_index_nodes, task_index_document @receiver(post_delete, dispatch_uid='document_index_delete', sender=Document) @@ -28,18 +28,14 @@ def document_index_delete(sender, **kwargs): @receiver(post_save, dispatch_uid='document_metadata_index_update', sender=DocumentMetadata) def document_metadata_index_update(sender, **kwargs): - task_update_indexes.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_delete', sender=DocumentMetadata) -def document_metadata_index_delete(sender, **kwargs): - task_delete_empty_index_nodes.apply_async(kwargs=dict(document_id=kwargs['instance'].document.pk), queue='indexing') - - @receiver(post_delete, dispatch_uid='document_metadata_index_post_delete', sender=DocumentMetadata) def document_metadata_index_post_delete(sender, **kwargs): - task_update_indexes.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(kwargs=dict(document_id=kwargs['instance'].document.pk), queue='indexing') register_maintenance_links([rebuild_index_instances], namespace='document_indexing', title=_(u'Indexes'))