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

Update document signatures app to use the new class based permissions

Browse Source
This commit is contained in:
Roberto Rosario
2012-01-01 20:50:46 -04:00
parent 600ba153af
commit 1c0a52c931
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/document_signatures/permissions.py
View File

@@ -3,13 +3,10 @@ from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from permissions.api import register_permission, set_namespace_title from permissions.api import register_permission, set_namespace_title
from permissions.models import PermissionNamespace, Permission
PERMISSION_DOCUMENT_VERIFY = {'namespace': 'document_signatures', 'name': 'document_verify', 'label': _(u'Verify document signatures')} document_signatures_namespace = PermissionNamespace('document_signatures', _(u'Document signatures'))
PERMISSION_SIGNATURE_UPLOAD = {'namespace': 'document_signatures', 'name': 'signature_upload', 'label': _(u'Upload detached signatures')}
PERMISSION_SIGNATURE_DOWNLOAD = {'namespace': 'document_signatures', 'name': 'key_receive', 'label': _(u'Download detached signatures')}
# Permission setup PERMISSION_DOCUMENT_VERIFY = Permission.objects.register(document_signatures_namespace, 'document_verify', _(u'Verify document signatures'))
set_namespace_title('document_signatures', _(u'Document signatures')) PERMISSION_SIGNATURE_UPLOAD = Permission.objects.register(document_signatures_namespace, 'signature_upload', _(u'Upload detached signatures'))
register_permission(PERMISSION_DOCUMENT_VERIFY) PERMISSION_SIGNATURE_DOWNLOAD = Permission.objects.register(document_signatures_namespace, 'signature_download', _(u'Download detached signatures'))
register_permission(PERMISSION_SIGNATURE_UPLOAD)
register_permission(PERMISSION_SIGNATURE_DOWNLOAD)

9
apps/document_signatures/views.py
View File

@@ -13,7 +13,7 @@ from django.conf import settings
from django.template.defaultfilters import force_escape from django.template.defaultfilters import force_escape
from documents.models import Document, RecentDocument from documents.models import Document, RecentDocument
from permissions.api import check_permissions from permissions.models import Permission
from filetransfers.api import serve_file from filetransfers.api import serve_file
from django_gpg.api import SIGNATURE_STATES from django_gpg.api import SIGNATURE_STATES
@@ -27,7 +27,7 @@ logger = logging.getLogger(__name__)
def document_verify(request, document_pk): def document_verify(request, document_pk):
check_permissions(request.user, [PERMISSION_DOCUMENT_VERIFY]) Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_VERIFY])
document = get_object_or_404(Document, pk=document_pk) document = get_object_or_404(Document, pk=document_pk)
RecentDocument.objects.add_document_for_user(request.user, document) RecentDocument.objects.add_document_for_user(request.user, document)
@@ -69,7 +69,8 @@ def document_verify(request, document_pk):
def document_signature_upload(request, document_pk): def document_signature_upload(request, document_pk):
check_permissions(request.user, [PERMISSION_SIGNATURE_UPLOAD]) Permission.objects.check_permissions(request.user, [PERMISSION_SIGNATURE_UPLOAD])
document = get_object_or_404(Document, pk=document_pk) document = get_object_or_404(Document, pk=document_pk)
RecentDocument.objects.add_document_for_user(request.user, document) RecentDocument.objects.add_document_for_user(request.user, document)
@@ -102,7 +103,7 @@ def document_signature_upload(request, document_pk):
def document_signature_download(request, document_pk): def document_signature_download(request, document_pk):
check_permissions(request.user, [PERMISSION_SIGNATURE_DOWNLOAD]) Permission.objects.check_permissions(request.user, [PERMISSION_SIGNATURE_DOWNLOAD])
document = get_object_or_404(Document, pk=document_pk) document = get_object_or_404(Document, pk=document_pk)
try: try: