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

Remove direct index updating and delete from metadata and source apps and move it to document indexing app via signals

Browse Source
This commit is contained in:
Roberto Rosario
2012-07-26 06:14:42 -04:00
parent 9dc07de628
commit ba550c7f03
4 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/metadata/views.py
-27
View File
@@ -13,7 +13,6 @@ from django.core.exceptions import PermissionDenied
from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT
from documents.models import Document, RecentDocument, DocumentType
from permissions.models import Permission
from document_indexing.api import update_indexes, delete_indexes
from acls.models import AccessEntry
from common.utils import generate_choices_w_labels, encapsulate, get_object_name
@@ -80,12 +79,6 @@ def metadata_edit(request, document_id=None, document_id_list=None):
formset = MetadataFormSet(request.POST)
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']:
@@ -101,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,12 +230,6 @@ def metadata_remove(request, document_id=None, document_id_list=None):
formset = MetadataRemoveFormSet(request.POST)
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'])
@@ -262,13 +242,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 = {