diff --git a/apps/document_signatures/permissions.py b/apps/document_signatures/permissions.py index 9bbfdfece8..8575d4c80c 100644 --- a/apps/document_signatures/permissions.py +++ b/apps/document_signatures/permissions.py @@ -3,13 +3,10 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ 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')} -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')} +document_signatures_namespace = PermissionNamespace('document_signatures', _(u'Document signatures')) -# Permission setup -set_namespace_title('document_signatures', _(u'Document signatures')) -register_permission(PERMISSION_DOCUMENT_VERIFY) -register_permission(PERMISSION_SIGNATURE_UPLOAD) -register_permission(PERMISSION_SIGNATURE_DOWNLOAD) +PERMISSION_DOCUMENT_VERIFY = Permission.objects.register(document_signatures_namespace, 'document_verify', _(u'Verify document signatures')) +PERMISSION_SIGNATURE_UPLOAD = Permission.objects.register(document_signatures_namespace, 'signature_upload', _(u'Upload detached signatures')) +PERMISSION_SIGNATURE_DOWNLOAD = Permission.objects.register(document_signatures_namespace, 'signature_download', _(u'Download detached signatures')) diff --git a/apps/document_signatures/views.py b/apps/document_signatures/views.py index 6c3d51fddf..b69f7aba38 100644 --- a/apps/document_signatures/views.py +++ b/apps/document_signatures/views.py @@ -13,7 +13,7 @@ from django.conf import settings from django.template.defaultfilters import force_escape from documents.models import Document, RecentDocument -from permissions.api import check_permissions +from permissions.models import Permission from filetransfers.api import serve_file from django_gpg.api import SIGNATURE_STATES @@ -27,7 +27,7 @@ logger = logging.getLogger(__name__) 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) 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): - 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) 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): - 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) try: