matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added new permission 'Delete document for OCR queue'

Browse Source
This commit is contained in:
Roberto Rosario
2011-02-17 23:46:50 -04:00
parent 9dc101fb0c
commit 0cc457aacc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/ocr/__init__.py
View File

@@ -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])

4
apps/ocr/views.py
View File

@@ -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: