diff --git a/apps/ocr/__init__.py b/apps/ocr/__init__.py index 1567ff125c..3bd43acb3e 100755 --- a/apps/ocr/__init__.py +++ b/apps/ocr/__init__.py @@ -16,14 +16,17 @@ from literals import QUEUEDOCUMENT_STATE_PROCESSING, \ #Permissions PERMISSION_OCR_DOCUMENT = 'ocr_document' +PERMISSION_OCR_DOCUMENT_DELETE = 'ocr_document_delete' + register_permissions('ocr', [ {'name':PERMISSION_OCR_DOCUMENT, 'label':_(u'Submit document for OCR')}, + {'name':PERMISSION_OCR_DOCUMENT_DELETE, 'label':_(u'Delete document for OCR queue')}, ]) #Links submit_document = {'text':_('submit to OCR queue'), 'view':'submit_document', 'args':'object.id', 'famfam':'hourglass_add', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_DOCUMENT]}} register_links(Document, [submit_document], menu_name='sidebar') -queue_document_delete = {'text':_(u'delete'), 'view':'queue_document_delete', 'args':'object.id', 'famfam':'hourglass_delete', '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]}} register_links(QueueDocument, [queue_document_delete]) diff --git a/apps/ocr/views.py b/apps/ocr/views.py index 031aae9b47..d43ffaab7e 100755 --- a/apps/ocr/views.py +++ b/apps/ocr/views.py @@ -11,7 +11,7 @@ from django.utils.translation import ugettext as _ from permissions.api import check_permissions, Unauthorized from documents.models import Document -from ocr import PERMISSION_OCR_DOCUMENT +from ocr import PERMISSION_OCR_DOCUMENT, PERMISSION_OCR_DOCUMENT_DELETE from models import DocumentQueue, QueueDocument, add_document_to_queue @@ -45,7 +45,7 @@ def queue_document_list(request, queue_name='default'): def queue_document_delete(request, queue_document_id): - permissions = [PERMISSION_OCR_DOCUMENT] + permissions = [PERMISSION_OCR_DOCUMENT_DELETE] try: check_permissions(request.user, 'ocr', permissions) except Unauthorized, e: