diff --git a/apps/ocr/__init__.py b/apps/ocr/__init__.py index c6114148d3..cb60eadc57 100644 --- a/apps/ocr/__init__.py +++ b/apps/ocr/__init__.py @@ -47,6 +47,7 @@ register_permission(PERMISSION_OCR_QUEUE_EDIT) #Links submit_document = {'text': _('submit to OCR queue'), 'view': 'submit_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} +submit_document_multiple = {'text': _('submit to OCR queue'), 'view': 'submit_document_multiple', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} re_queue_document = {'text': _('re-queue'), 'view': 're_queue_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} re_queue_multiple_document = {'text': _('re-queue'), 'view': 're_queue_multiple_document', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} queue_document_delete = {'text': _(u'delete'), 'view': 'queue_document_delete', 'args': 'object.id', 'famfam': 'hourglass_delete', 'permissions': [PERMISSION_OCR_DOCUMENT_DELETE]} @@ -68,6 +69,8 @@ setup_queue_transformation_edit = {'text': _(u'edit'), 'view': 'setup_queue_tran setup_queue_transformation_delete = {'text': _(u'delete'), 'view': 'setup_queue_transformation_delete', 'args': 'transformation.pk', 'famfam': 'shape_square_delete'} register_links(Document, [submit_document]) +register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_list', 'document_type_document_list', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent'], [submit_document_multiple]) + register_links(DocumentQueue, [document_queue_disable, document_queue_enable, setup_queue_transformation_list]) register_links(QueueTransformation, [setup_queue_transformation_edit, setup_queue_transformation_delete]) diff --git a/apps/ocr/urls.py b/apps/ocr/urls.py index 2db0a0db0b..dd8529119b 100644 --- a/apps/ocr/urls.py +++ b/apps/ocr/urls.py @@ -2,6 +2,7 @@ from django.conf.urls.defaults import patterns, url urlpatterns = patterns('ocr.views', url(r'^document/(?P\d+)/submit/$', 'submit_document', (), 'submit_document'), + url(r'^document/multiple/submit/$', 'submit_document_multiple', (), 'submit_document_multiple'), url(r'^queue/document/list/$', 'queue_document_list', (), 'queue_document_list'), url(r'^queue/document/(?P\d+)/delete/$', 'queue_document_delete', (), 'queue_document_delete'), url(r'^queue/document/multiple/delete/$', 'queue_document_multiple_delete', (), 'queue_document_multiple_delete'), diff --git a/apps/ocr/views.py b/apps/ocr/views.py index 4c21381a9e..d6102f1200 100644 --- a/apps/ocr/views.py +++ b/apps/ocr/views.py @@ -115,9 +115,16 @@ def queue_document_delete(request, queue_document_id=None, queue_document_id_lis def queue_document_multiple_delete(request): - return queue_document_delete(request, queue_document_id_list=request.GET.get('id_list', [])) + return queue_document_delete(request, queue_document_id_list=request.GET.get('id_list', '')) +def submit_document_multiple(request): + for item_id in request.GET.get('id_list', '').split(','): + submit_document(request, item_id) + + return HttpResponseRedirect(request.META['HTTP_REFERER']) + + def submit_document(request, document_id): check_permissions(request.user, [PERMISSION_OCR_DOCUMENT])