diff --git a/apps/ocr/__init__.py b/apps/ocr/__init__.py index 924c058e28..b239a74f64 100644 --- a/apps/ocr/__init__.py +++ b/apps/ocr/__init__.py @@ -30,6 +30,7 @@ submit_document = {'text':_('submit to OCR queue'), 'view':'submit_document', 'a re_queue_document = {'text':_('re-queue'), 'view':'re_queue_document', 'args':'object.id', 'famfam':'hourglass_add', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_DOCUMENT]}} re_queue_multiple_document = {'text':_('re-queue'), 'view':'re_queue_multiple_document', 'famfam':'hourglass_add', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_DOCUMENT]}} queue_document_delete = {'text':_(u'delete'), 'view':'queue_document_delete', 'args':'object.id', 'famfam':'hourglass_delete', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_DOCUMENT_DELETE]}} +queue_document_multiple_delete = {'text':_(u'delete'), 'view':'queue_document_multiple_delete', 'famfam':'hourglass_delete', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_DOCUMENT_DELETE]}} document_queue_disable = {'text':_(u'stop queue'), 'view':'document_queue_disable', 'args':'object.id', 'famfam':'control_stop_blue', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_QUEUE_ENABLE_DISABLE]}} document_queue_enable = {'text':_(u'activate queue'), 'view':'document_queue_enable', 'args':'object.id', 'famfam':'control_play_blue', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_QUEUE_ENABLE_DISABLE]}} @@ -38,7 +39,7 @@ register_links(Document, [submit_document], menu_name='sidebar') register_links(DocumentQueue, [document_queue_disable, document_queue_enable]) register_links(QueueDocument, [re_queue_document, queue_document_delete]) -register_multi_item_links(['queue_document_list'], [re_queue_multiple_document]) +register_multi_item_links(['queue_document_list'], [re_queue_multiple_document, queue_document_multiple_delete]) #Menus register_menu([ diff --git a/apps/ocr/urls.py b/apps/ocr/urls.py index ba72984f22..a6e58c09dc 100644 --- a/apps/ocr/urls.py +++ b/apps/ocr/urls.py @@ -5,6 +5,7 @@ urlpatterns = patterns('ocr.views', url(r'^(?P\d+)/submit/$', 'submit_document', (), 'submit_document'), url(r'^ocr/queue/document/list/$', 'queue_document_list', (), 'queue_document_list'), url(r'^ocr/queue/document/(?P\d+)/delete/$', 'queue_document_delete', (), 'queue_document_delete'), + url(r'^ocr/queue/document/multiple/delete/$', 'queue_document_multiple_delete', (), 'queue_document_multiple_delete'), url(r'^ocr/queue/document/(?P\d+)/re-queue/$', 're_queue_document', (), 're_queue_document'), url(r'^ocr/queue/document/multiple/re-queue/$', 're_queue_multiple_document', (), 're_queue_multiple_document'), diff --git a/apps/ocr/views.py b/apps/ocr/views.py index 7b92037705..3b2b186c18 100644 --- a/apps/ocr/views.py +++ b/apps/ocr/views.py @@ -63,21 +63,70 @@ def queue_document_list(request, queue_name='default'): ) -def queue_document_delete(request, queue_document_id): +def queue_document_delete(request, queue_document_id=None, queue_document_id_list=[]): check_permissions(request.user, 'ocr', [PERMISSION_OCR_DOCUMENT_DELETE]) + + if queue_document_id: + queue_documents = [get_object_or_404(QueueDocument, pk=queue_document_id)] + post_redirect = None + elif queue_document_id_list: + queue_documents = [get_object_or_404(QueueDocument, pk=queue_document_id) for queue_document_id in queue_document_id_list.split(',')] + post_redirect = None + else: + messages.error(request, _(u'Must provide at least one queue document.')) + return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None))) + + for queue_document in queue_documents: + try: + queue_document.document + except Document.DoesNotExist: + messages.error(request, _(u'Document id#: %d, no longer exists.') % queue_document.document_id) + return HttpResponseRedirect(previous) + + if request.method == 'POST': + for queue_document in queue_documents: + try: + queue_document.delete() + messages.success(request, _(u'Document: %(document)s deleted successfully.') % { + 'document':queue_document.document}) + + except Exception, e: + messages.error(request, _(u'Error deleting document: %(document)s; %(error)s') % { + 'document':queue_document, 'error':e}) + return HttpResponseRedirect(next) + + context = { + 'next':next, + 'previous':previous, + 'delete_view':True + } + + if len(queue_documents) == 1: + context['object'] = queue_documents[0] + context['title'] = _(u'Are you sure you with to delete from queue document: %s?') % ', '.join([unicode(d) for d in queue_documents]) + elif len(queue_documents) > 1: + context['title'] = _(u'Are you sure you with to delete from queue documents: %s?') % ', '.join([unicode(d) for d in queue_documents]) - return delete_object(request, model=QueueDocument, object_id=queue_document_id, - template_name='generic_confirm.html', - post_delete_redirect=reverse('queue_document_list'), - extra_context={ - 'delete_view':True, - 'next':next, - 'previous':previous, - 'object_name':_(u'queued document'), - }) + return render_to_response('generic_confirm.html', context, + context_instance=RequestContext(request)) + + +# return delete_object(request, model=QueueDocument, object_id=queue_document_id, +# template_name='generic_confirm.html', +# post_delete_redirect=reverse('queue_document_list'), +# extra_context={ +# 'delete_view':True, +# 'next':next, +# 'previous':previous, +# 'object_name':_(u'queued document'), +# }) + + +def queue_document_multiple_delete(request): + return queue_document_delete(request, queue_document_id_list=request.GET.get('id_list', [])) def submit_document(request, document_id):