From db2ca4fb58f73d6651a0c92f3478faac9192ffb7 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 22 Oct 2014 19:33:20 -0400 Subject: [PATCH] Issue #85, Reset page count for a single or multiple documents. Issue #57, convert to celery task --- mayan/apps/documents/__init__.py | 9 +++-- mayan/apps/documents/links.py | 3 +- mayan/apps/documents/tasks.py | 8 +++- mayan/apps/documents/urls.py | 3 +- mayan/apps/documents/views.py | 68 +++++++++++++++++++++----------- 5 files changed, 62 insertions(+), 29 deletions(-) diff --git a/mayan/apps/documents/__init__.py b/mayan/apps/documents/__init__.py index 78af5248ec..190d7a56e9 100644 --- a/mayan/apps/documents/__init__.py +++ b/mayan/apps/documents/__init__.py @@ -26,7 +26,8 @@ from .links import (document_clear_image_cache, document_list_recent, document_missing_list, document_multiple_delete, document_multiple_clear_transformations, - document_multiple_download, document_page_edit, + document_multiple_download, + document_multiple_update_page_count, document_page_edit, document_page_navigation_first, document_page_navigation_last, document_page_navigation_next, @@ -74,8 +75,8 @@ register_links(['documents:setup_document_type_metadata', 'documents:document_ty register_links([DocumentTypeFilename, 'documents:document_type_filename_list', 'documents:document_type_filename_create'], [document_type_filename_create], menu_name='sidebar') # Register document links -register_links(Document, [document_view_simple, document_edit, document_print, document_delete, document_download, document_clear_transformations]) -register_multi_item_links(['folders:folder_view', 'index_instance_node_view', 'search', 'results', 'document_group_view', 'documents:document_list', 'documents:document_list_recent', 'tags:tag_tagged_item_list'], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download]) +register_links(Document, [document_view_simple, document_edit, document_print, document_delete, document_download, document_clear_transformations, document_update_page_count]) +register_multi_item_links(['folders:folder_view', 'index_instance_node_view', 'search', 'results', 'document_group_view', 'documents:document_list', 'documents:document_list_recent', 'tags:tag_tagged_item_list'], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download, document_multiple_update_page_count]) # Document Version links register_links(DocumentVersion, [document_version_revert, document_version_download]) @@ -102,7 +103,7 @@ register_links('documents:document_page_transformation_create', [document_page_t register_links(['documents:document_page_transformation_edit', 'documents:document_page_transformation_delete'], [document_page_transformation_create], menu_name='sidebar') register_diagnostic('documents', _(u'Documents'), document_missing_list) -register_maintenance_links([document_update_page_count, document_clear_image_cache], namespace='documents', title=_(u'Documents')) +register_maintenance_links([document_clear_image_cache], namespace='documents', title=_(u'Documents')) register_model_list_columns(Document, [ { 'name': _(u'Thumbnail'), 'attribute': diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index b16e63f1cf..9a7e476ebc 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -46,7 +46,8 @@ document_edit = {'text': _(u'Edit'), 'view': 'documents:document_edit', 'args': document_download = {'text': _(u'Download'), 'view': 'documents:document_download', 'args': 'object.id', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]} document_multiple_download = {'text': _(u'Download'), 'view': 'documents:document_multiple_download', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]} document_version_download = {'text': _(u'Download'), 'view': 'documents:document_version_download', 'args': 'object.pk', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]} -document_update_page_count = {'text': _(u'Update office documents\' page count'), 'view': 'documents:document_update_page_count', 'famfam': 'page_white_csharp', 'permissions': [PERMISSION_DOCUMENT_TOOLS], 'description': _(u'Update the page count of the office type documents. This is useful when enabling office document support after there were already office type documents in the database.')} +document_update_page_count = {'text': _(u'Reset page count'), 'view': 'documents:document_update_page_count', 'args': 'object.pk', 'famfam': 'page_white_csharp', 'permissions': [PERMISSION_DOCUMENT_TOOLS]} +document_multiple_update_page_count = {'text': _(u'Reset page count'), 'view': 'documents:document_multiple_update_page_count', 'famfam': 'page_white_csharp', 'permissions': [PERMISSION_DOCUMENT_TOOLS]} document_clear_transformations = {'text': _(u'Clear transformations'), 'view': 'documents:document_clear_transformations', 'args': 'object.id', 'famfam': 'page_paintbrush', 'permissions': [PERMISSION_DOCUMENT_TRANSFORM]} document_multiple_clear_transformations = {'text': _(u'Clear transformations'), 'view': 'documents:document_multiple_clear_transformations', 'famfam': 'page_paintbrush', 'permissions': [PERMISSION_DOCUMENT_TRANSFORM]} document_print = {'text': _(u'Print'), 'view': 'documents:document_print', 'args': 'object.id', 'famfam': 'printer', 'permissions': [PERMISSION_DOCUMENT_VIEW]} diff --git a/mayan/apps/documents/tasks.py b/mayan/apps/documents/tasks.py index 128f9705f4..d20c81e248 100644 --- a/mayan/apps/documents/tasks.py +++ b/mayan/apps/documents/tasks.py @@ -2,7 +2,7 @@ import logging from mayan.celery import app -from .models import Document +from .models import Document, DocumentVersion logger = logging.getLogger(__name__) @@ -20,3 +20,9 @@ def task_clear_image_cache(): Document.clear_image_cache() # except Exception as exception: # messages.error(request, _(u'Error clearing document image cache; %s') % exception) + + +@app.task +def task_update_page_count(version_id): + document_version = DocumentVersion.objects.get(pk=version_id) + document_version.update_page_count() diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py index 916371c5ad..9e52d79906 100644 --- a/mayan/apps/documents/urls.py +++ b/mayan/apps/documents/urls.py @@ -20,6 +20,8 @@ urlpatterns = patterns('documents.views', url(r'^(?P\d+)/edit/$', 'document_edit', (), 'document_edit'), url(r'^(?P\d+)/print/$', 'document_print', (), 'document_print'), url(r'^(?P\d+)/hard_copy/$', 'document_hard_copy', (), 'document_hard_copy'), + url(r'^(?P\d+)/reset_page_count/$', 'document_update_page_count', (), 'document_update_page_count'), + url(r'^multiple/reset_page_count/$', 'document_multiple_update_page_count', (), 'document_multiple_update_page_count'), url(r'^(?P\d+)/display/$', 'get_document_image', {'size': DISPLAY_SIZE}, 'document_display'), url(r'^(?P\d+)/display/print/$', 'get_document_image', {'size': PRINT_SIZE}, 'document_display_print'), @@ -33,7 +35,6 @@ urlpatterns = patterns('documents.views', url(r'^document/version/(?P\d+)/revert/$', 'document_version_revert', (), 'document_version_revert'), url(r'^multiple/clear_transformations/$', 'document_multiple_clear_transformations', (), 'document_multiple_clear_transformations'), - url(r'^maintenance/update_page_count/$', 'document_update_page_count', (), 'document_update_page_count'), url(r'^maintenance/clear_image_cache/$', 'document_clear_image_cache', (), 'document_clear_image_cache'), url(r'^page/(?P\d+)/$', 'document_page_view', (), 'document_page_view'), diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index 1c54408039..802ca8b120 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -12,7 +12,7 @@ from django.http import HttpResponseRedirect from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext from django.utils.http import urlencode -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _, ungettext import sendfile @@ -50,7 +50,8 @@ from .permissions import (PERMISSION_DOCUMENT_PROPERTIES_EDIT, from .runtime import storage_backend from .settings import (PREVIEW_SIZE, RECENT_COUNT, ROTATION_STEP, ZOOM_PERCENT_STEP, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL) -from .tasks import task_clear_image_cache, task_get_document_image +from .tasks import (task_clear_image_cache, task_get_document_image, + task_update_page_count) logger = logging.getLogger(__name__) @@ -398,35 +399,58 @@ def document_multiple_download(request): ) -def document_update_page_count(request): - Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TOOLS]) +def document_update_page_count(request, document_id=None, document_id_list=None): + if document_id: + documents = [get_object_or_404(Document.objects, pk=document_id)] + post_redirect = reverse('documents:document_view_simple', args=[documents[0].pk]) + elif document_id_list: + documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')] + post_redirect = None + else: + messages.error(request, _(u'Must provide at least one document.')) + return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))) + + try: + Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TOOLS]) + except PermissionDenied: + documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_DOCUMENT_TOOLS, request.user, documents, exception_on_empty=True) - office_converter = OfficeConverter() - qs = DocumentVersion.objects.exclude(filename__iendswith='dxf').filter(mimetype__in=office_converter.mimetypes()) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) if request.method == 'POST': - updated = 0 - processed = 0 - for document_version in qs: - old_page_count = document_version.pages.count() - document_version.update_page_count() - processed += 1 - if old_page_count != document_version.pages.count(): - updated += 1 + for document in documents: + task_update_page_count.apply_async(kwargs={'version_id': document.latest_version.pk}, queue='tools') - messages.success(request, _(u'Page count update complete. Documents processed: %(total)d, documents with changed page count: %(change)d') % { - 'total': processed, - 'change': updated - }) + messages.success(request, + ungettext( + _(u'Document queued for page count reset.'), + _(u'Documents queued for page count reset.'), + len(documents) + ) + ) return HttpResponseRedirect(previous) - return render_to_response('main/generic_confirm.html', { + title = ungettext( + _(u'Are you sure you wish to reset the page count of this document?'), + _(u'Are you sure you wish to reset the page count of these documents?'), + len(documents) + ) + + context = { 'previous': previous, - 'title': _(u'Are you sure you wish to update the page count for the office documents (%d)?') % qs.count(), - 'message': _(u'On large databases this operation may take some time to execute.'), + 'title': title, 'form_icon': u'page_white_csharp.png', - }, context_instance=RequestContext(request)) + } + + if len(documents) == 1: + context['object'] = documents[0] + + return render_to_response('main/generic_confirm.html', context, + context_instance=RequestContext(request)) + + +def document_multiple_update_page_count(request): + return document_update_page_count(request, document_id_list=request.GET.get('id_list', [])) def document_clear_transformations(request, document_id=None, document_id_list=None):