diff --git a/apps/ocr/__init__.py b/apps/ocr/__init__.py index 1bed491709..caf429d36a 100644 --- a/apps/ocr/__init__.py +++ b/apps/ocr/__init__.py @@ -20,6 +20,7 @@ PERMISSION_OCR_DOCUMENT = {'namespace': 'ocr', 'name': 'ocr_document', 'label': PERMISSION_OCR_DOCUMENT_DELETE = {'namespace': 'ocr', 'name': 'ocr_document_delete', 'label': _(u'Delete document for OCR queue')} PERMISSION_OCR_QUEUE_ENABLE_DISABLE = {'namespace': 'ocr', 'name': 'ocr_queue_enable_disable', 'label': _(u'Can enable/disable an OCR queue')} PERMISSION_OCR_CLEAN_ALL_PAGES = {'namespace': 'ocr', 'name': 'ocr_clean_all_pages', 'label': _(u'Can execute an OCR clean up on all document pages')} +PERMISSION_OCR_QUEUE_EDIT = {'namespace': 'ocr_setup', 'name': 'ocr_queue_edit', 'label': _(u'Can edit an OCR queue properties')} set_namespace_title('ocr', _(u'OCR')) register_permission(PERMISSION_OCR_DOCUMENT) @@ -27,6 +28,9 @@ register_permission(PERMISSION_OCR_DOCUMENT_DELETE) register_permission(PERMISSION_OCR_QUEUE_ENABLE_DISABLE) register_permission(PERMISSION_OCR_CLEAN_ALL_PAGES) +set_namespace_title('ocr_setup', _(u'OCR Setup')) +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]} re_queue_document = {'text': _('re-queue'), 'view': 're_queue_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} diff --git a/apps/ocr/views.py b/apps/ocr/views.py index 3dbf1ae051..9328ce3bc5 100644 --- a/apps/ocr/views.py +++ b/apps/ocr/views.py @@ -15,7 +15,8 @@ from documents.models import Document from documents.widgets import document_link, document_thumbnail from ocr import PERMISSION_OCR_DOCUMENT, PERMISSION_OCR_DOCUMENT_DELETE, \ - PERMISSION_OCR_QUEUE_ENABLE_DISABLE, PERMISSION_OCR_CLEAN_ALL_PAGES + PERMISSION_OCR_QUEUE_ENABLE_DISABLE, PERMISSION_OCR_CLEAN_ALL_PAGES, \ + PERMISSION_OCR_QUEUE_EDIT from ocr.models import DocumentQueue, QueueDocument, QueueTransformation from ocr.literals import QUEUEDOCUMENT_STATE_PENDING, \ @@ -324,7 +325,7 @@ def node_active_list(request): def setup_queue_transformation_list(request, document_queue_id): - #check_permissions(request.user, [PERMISSION_SOURCES_SETUP_EDIT]) + check_permissions(request.user, [PERMISSION_OCR_QUEUE_EDIT]) document_queue = get_object_or_404(DocumentQueue, pk=document_queue_id) @@ -351,7 +352,7 @@ def setup_queue_transformation_list(request, document_queue_id): def setup_queue_transformation_edit(request, transformation_id): - #check_permissions(request.user, [PERMISSION_SOURCES_SETUP_EDIT]) + check_permissions(request.user, [PERMISSION_OCR_QUEUE_EDIT]) transformation = get_object_or_404(QueueTransformation, pk=transformation_id) redirect_view = reverse('setup_queue_transformation_list', args=[transformation.content_object.pk]) @@ -390,7 +391,7 @@ def setup_queue_transformation_edit(request, transformation_id): def setup_queue_transformation_delete(request, transformation_id): - #check_permissions(request.user, [PERMISSION_SOURCES_SETUP_EDIT]) + check_permissions(request.user, [PERMISSION_OCR_QUEUE_EDIT]) transformation = get_object_or_404(QueueTransformation, pk=transformation_id) redirect_view = reverse('setup_queue_transformation_list', args=[transformation.content_object.pk]) @@ -424,7 +425,7 @@ def setup_queue_transformation_delete(request, transformation_id): def setup_queue_transformation_create(request, document_queue_id): - #check_permissions(request.user, [PERMISSION_SOURCES_SETUP_EDIT]) + check_permissions(request.user, [PERMISSION_OCR_QUEUE_EDIT]) document_queue = get_object_or_404(DocumentQueue, pk=document_queue_id)