Final changes to support permissions and roles

This commit is contained in:
Roberto Rosario
2011-02-13 04:33:40 -04:00
parent a47ff7c4b4
commit 344a613514
24 changed files with 455 additions and 71 deletions
+7 -1
View File
@@ -1,11 +1,17 @@
from django.utils.translation import ugettext_lazy as _
from common.api import register_links, register_menu
from permissions.api import register_permissions
from documents.models import Document
OCR_DOCUMENT_OCR = 'document_ocr'
submit_document = {'text':_('submit to OCR queue'), 'view':'submit_document', 'args':'object.id', 'famfam':'page_lightning'}
register_permissions('ocr', [
{'name':OCR_DOCUMENT_OCR, 'label':_(u'Submit document for OCR')},
])
submit_document = {'text':_('submit to OCR queue'), 'view':'submit_document', 'args':'object.id', 'famfam':'page_lightning', 'permissions':{'namespace':'ocr', 'permissions':[OCR_DOCUMENT_OCR]}}
register_links(Document, [submit_document], menu_name='sidebar')
+9 -3
View File
@@ -1,4 +1,4 @@
from django.http import HttpResponse, HttpResponseRedirect
from django.http import HttpResponse, HttpResponseRedirect, Http404
from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.template import RequestContext
from django.contrib import messages
@@ -8,13 +8,19 @@ from django.core.urlresolvers import reverse
from django.conf import settings
from django.utils.translation import ugettext as _
from permissions.api import check_permissions, Unauthorized
from documents.models import Document
from ocr import OCR_DOCUMENT_OCR
from api import ocr_document
def submit_document(request, document_id):
permissions = [OCR_DOCUMENT_OCR]
try:
check_permissions(request.user, 'ocr', permissions)
except Unauthorized, e:
raise Http404(e)
document = get_object_or_404(Document, pk=document_id)
try: