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

Do not update indexes from the documents app

Browse Source
This commit is contained in:
Roberto Rosario
2014-05-19 20:32:15 -04:00
parent c7e176a793
commit bd3cd8585b
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/documents/views.py
View File

@@ -28,9 +28,6 @@ from common.conf.settings import DEFAULT_PAPER_SIZE
from converter.literals import (DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, from converter.literals import (DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION,
DEFAULT_PAGE_NUMBER, DEFAULT_FILE_FORMAT_MIMETYPE) DEFAULT_PAGE_NUMBER, DEFAULT_FILE_FORMAT_MIMETYPE)
from converter.office_converter import OfficeConverter from converter.office_converter import OfficeConverter
# TODO: do not import from document_indexing, update document_indexing to
# catch Document model after save and after delete signals
from document_indexing.api import update_indexes, delete_indexes
from filetransfers.api import serve_file from filetransfers.api import serve_file
from history.api import create_history from history.api import create_history
from navigation.utils import resolve_to_name from navigation.utils import resolve_to_name
@@ -183,11 +180,6 @@ def document_delete(request, document_id=None, document_id_list=None):
if request.method == 'POST': if request.method == 'POST':
for document in documents: for document in documents:
try: try:
warnings = delete_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, warning)
document.delete() document.delete()
# create_history(HISTORY_DOCUMENT_DELETED, data={'user': request.user, 'document': document}) # create_history(HISTORY_DOCUMENT_DELETED, data={'user': request.user, 'document': document})
messages.success(request, _(u'Document deleted successfully.')) messages.success(request, _(u'Document deleted successfully.'))
@@ -232,11 +224,6 @@ def document_edit(request, document_id):
old_document = copy.copy(document) old_document = copy.copy(document)
form = DocumentForm_edit(request.POST, instance=document) form = DocumentForm_edit(request.POST, instance=document)
if form.is_valid(): if form.is_valid():
warnings = delete_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, warning)
document.filename = form.cleaned_data['new_filename'] document.filename = form.cleaned_data['new_filename']
document.description = form.cleaned_data['description'] document.description = form.cleaned_data['description']
@@ -250,11 +237,6 @@ def document_edit(request, document_id):
messages.success(request, _(u'Document "%s" edited successfully.') % document) messages.success(request, _(u'Document "%s" edited successfully.') % document)
warnings = update_indexes(document)
if request.user.is_staff or request.user.is_superuser:
for warning in warnings:
messages.warning(request, warning)
return HttpResponseRedirect(document.get_absolute_url()) return HttpResponseRedirect(document.get_absolute_url())
else: else:
form = DocumentForm_edit(instance=document, initial={ form = DocumentForm_edit(instance=document, initial={