From 1d609333dc54fa06f3f8d65f479b51dd2577ab6e Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 19 May 2014 15:08:59 -0400 Subject: [PATCH] Update indexes via signals from metadata updates or document deletions --- apps/document_indexing/__init__.py | 28 +++++++++++++++++++++++++++- apps/metadata/views.py | 25 ------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/apps/document_indexing/__init__.py b/apps/document_indexing/__init__.py index 09ed7ec306..16b085224a 100644 --- a/apps/document_indexing/__init__.py +++ b/apps/document_indexing/__init__.py @@ -1,14 +1,18 @@ from __future__ import absolute_import +from django.db.models.signals import post_save, pre_delete, post_delete +from django.dispatch import receiver from django.utils.translation import ugettext_lazy as _ -from documents.permissions import PERMISSION_DOCUMENT_VIEW from documents.models import Document +from documents.permissions import PERMISSION_DOCUMENT_VIEW from main.api import register_maintenance_links +from metadata.models import DocumentMetadata from navigation.api import (register_top_menu, register_sidebar_template, register_links) from project_setup.api import register_setup +from .api import update_indexes, delete_indexes from .links import (index_setup, index_setup_list, index_setup_create, index_setup_edit, index_setup_delete, index_setup_view, index_setup_document_types, template_node_create, template_node_edit, template_node_delete, index_list, index_parent, document_index_list, @@ -22,6 +26,28 @@ from .permissions import (PERMISSION_DOCUMENT_INDEXING_VIEW, PERMISSION_DOCUMENT_INDEXING_DELETE ) + +@receiver(pre_delete, dispatch_uid='document_index_delete', sender=Document) +def document_index_delete(sender, **kwargs): + delete_indexes(kwargs['instance']) + + +@receiver(post_save, dispatch_uid='document_metadata_index_update', sender=DocumentMetadata) +def document_metadata_index_update(sender, **kwargs): + delete_indexes(kwargs['instance'].document) + update_indexes(kwargs['instance'].document) + + +@receiver(pre_delete, dispatch_uid='document_metadata_index_delete', sender=DocumentMetadata) +def document_metadata_index_delete(sender, **kwargs): + delete_indexes(kwargs['instance'].document) + + +@receiver(post_delete, dispatch_uid='document_metadata_index_post_delete', sender=DocumentMetadata) +def document_metadata_index_post_delete(sender, **kwargs): + update_indexes(kwargs['instance'].document) + + register_top_menu('indexes', document_index_main_menu_link) register_maintenance_links([rebuild_index_instances], namespace='document_indexing', title=_(u'Indexes')) diff --git a/apps/metadata/views.py b/apps/metadata/views.py index 007fbcaf57..b09aab6236 100644 --- a/apps/metadata/views.py +++ b/apps/metadata/views.py @@ -10,7 +10,6 @@ from django.utils.http import urlencode from django.utils.translation import ugettext_lazy as _ from acls.models import AccessEntry -from document_indexing.api import update_indexes, delete_indexes from documents.models import Document, RecentDocument, DocumentType from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT from permissions.models import Permission @@ -80,11 +79,6 @@ def metadata_edit(request, document_id=None, document_id_list=None): if formset.is_valid(): for document in documents: - warnings = delete_indexes(document) - if request.user.is_staff or request.user.is_superuser: - for warning in warnings: - messages.warning(request, _(u'Error deleting document indexes; %s') % warning) - errors = [] for form in formset.forms: if form.cleaned_data['update']: @@ -100,13 +94,6 @@ def metadata_edit(request, document_id=None, document_id_list=None): else: messages.success(request, _(u'Metadata for document %s edited successfully.') % document) - warnings = update_indexes(document) - if warnings and (request.user.is_staff or request.user.is_superuser): - for warning in warnings: - messages.warning(request, _(u'Error updating document indexes; %s') % warning) - else: - messages.success(request, _(u'Document indexes updated successfully.')) - return HttpResponseRedirect(next) context = { @@ -244,11 +231,6 @@ def metadata_remove(request, document_id=None, document_id_list=None): if formset.is_valid(): for document in documents: - warnings = delete_indexes(document) - if request.user.is_staff or request.user.is_superuser: - for warning in warnings: - messages.warning(request, _(u'Error deleting document indexes; %s') % warning) - for form in formset.forms: if form.cleaned_data['update']: metadata_type = get_object_or_404(MetadataType, pk=form.cleaned_data['id']) @@ -261,13 +243,6 @@ def metadata_remove(request, document_id=None, document_id_list=None): messages.error(request, _(u'Error removing metadata type: %(metadata_type)s from document: %(document)s.') % { 'metadata_type': metadata_type, 'document': document}) - warnings = update_indexes(document) - if warnings and (request.user.is_staff or request.user.is_superuser): - for warning in warnings: - messages.warning(request, _(u'Error updating document indexes; %s') % warning) - else: - messages.success(request, _(u'Document indexes updated successfully.')) - return HttpResponseRedirect(next) context = {