Allow registering permission from the permission namespace. Replace all permission variables to be lowercase (style guide reserver uppercase variables for constants and literals).

This commit is contained in:
Roberto Rosario
2015-06-28 00:19:49 -04:00
parent 956ca08cbd
commit d26402974a
82 changed files with 898 additions and 895 deletions
+26 -26
View File
@@ -9,7 +9,7 @@ from rest_framework.response import Response
from acls.models import AccessEntry
from documents.models import Document, DocumentType
from documents.permissions import (
PERMISSION_DOCUMENT_TYPE_VIEW, PERMISSION_DOCUMENT_TYPE_EDIT
permission_document_type_view, permission_document_type_edit
)
from permissions.models import Permission
from rest_api.filters import MayanObjectPermissionsFilter
@@ -17,10 +17,10 @@ from rest_api.permissions import MayanPermission
from .models import DocumentMetadata, MetadataType
from .permissions import (
PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_REMOVE,
PERMISSION_METADATA_DOCUMENT_EDIT, PERMISSION_METADATA_DOCUMENT_VIEW,
PERMISSION_METADATA_TYPE_CREATE, PERMISSION_METADATA_TYPE_DELETE,
PERMISSION_METADATA_TYPE_EDIT, PERMISSION_METADATA_TYPE_VIEW
permission_metadata_document_add, permission_metadata_document_remove,
permission_metadata_document_edit, permission_metadata_document_view,
permission_metadata_type_create, permission_metadata_type_delete,
permission_metadata_type_edit, permission_metadata_type_view
)
from .serializers import (
DocumentMetadataSerializer, DocumentTypeNewMetadataTypeSerializer,
@@ -34,8 +34,8 @@ class APIMetadataTypeListView(generics.ListCreateAPIView):
permission_classes = (MayanPermission,)
filter_backends = (MayanObjectPermissionsFilter,)
mayan_object_permissions = {'GET': [PERMISSION_METADATA_TYPE_VIEW]}
mayan_view_permissions = {'POST': [PERMISSION_METADATA_TYPE_CREATE]}
mayan_object_permissions = {'GET': [permission_metadata_type_view]}
mayan_view_permissions = {'POST': [permission_metadata_type_create]}
def get(self, *args, **kwargs):
"""Returns a list of all the metadata types."""
@@ -52,10 +52,10 @@ class APIMetadataTypeView(generics.RetrieveUpdateDestroyAPIView):
permission_classes = (MayanPermission,)
mayan_object_permissions = {
'GET': [PERMISSION_METADATA_TYPE_VIEW],
'PUT': [PERMISSION_METADATA_TYPE_EDIT],
'PATCH': [PERMISSION_METADATA_TYPE_EDIT],
'DELETE': [PERMISSION_METADATA_TYPE_DELETE]
'GET': [permission_metadata_type_view],
'PUT': [permission_metadata_type_edit],
'PATCH': [permission_metadata_type_edit],
'DELETE': [permission_metadata_type_delete]
}
def delete(self, *args, **kwargs):
@@ -88,17 +88,17 @@ class APIDocumentMetadataListView(generics.ListCreateAPIView):
if self.request == 'GET':
# Make sure the use has the permission to see the metadata for this document
try:
Permission.objects.check_permissions(self.request.user, [PERMISSION_METADATA_DOCUMENT_VIEW])
Permission.objects.check_permissions(self.request.user, [permission_metadata_document_view])
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_METADATA_DOCUMENT_VIEW, self.request.user, document)
AccessEntry.objects.check_access(permission_metadata_document_view, self.request.user, document)
else:
return document.metadata.all()
elif self.request == 'POST':
# Make sure the use has the permission to add metadata to this document
try:
Permission.objects.check_permissions(self.request.user, [PERMISSION_METADATA_DOCUMENT_ADD])
Permission.objects.check_permissions(self.request.user, [permission_metadata_document_add])
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_METADATA_DOCUMENT_ADD, self.request.user, document)
AccessEntry.objects.check_access(permission_metadata_document_add, self.request.user, document)
else:
return document.metadata.all()
@@ -120,10 +120,10 @@ class APIDocumentMetadataView(generics.RetrieveUpdateDestroyAPIView):
permission_classes = (MayanPermission,)
mayan_object_permissions = {
'GET': [PERMISSION_METADATA_DOCUMENT_VIEW],
'PUT': [PERMISSION_METADATA_DOCUMENT_EDIT],
'PATCH': [PERMISSION_METADATA_DOCUMENT_EDIT],
'DELETE': [PERMISSION_METADATA_DOCUMENT_REMOVE]
'GET': [permission_metadata_document_view],
'PUT': [permission_metadata_document_edit],
'PATCH': [permission_metadata_document_edit],
'DELETE': [permission_metadata_document_remove]
}
def delete(self, *args, **kwargs):
@@ -155,16 +155,16 @@ class APIDocumentMetadataView(generics.RetrieveUpdateDestroyAPIView):
class APIDocumentTypeMetadataTypeOptionalListView(generics.ListCreateAPIView):
permission_classes = (MayanPermission,)
mayan_view_permissions = {'POST': [PERMISSION_DOCUMENT_TYPE_EDIT]}
mayan_view_permissions = {'POST': [permission_document_type_edit]}
required_metadata = False
def get_queryset(self):
document_type = get_object_or_404(DocumentType, pk=self.kwargs['document_type_pk'])
try:
Permission.objects.check_permissions(self.request.user, [PERMISSION_DOCUMENT_TYPE_VIEW])
Permission.objects.check_permissions(self.request.user, [permission_document_type_view])
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_TYPE_VIEW, self.request.user, document_type)
AccessEntry.objects.check_access(permission_document_type_view, self.request.user, document_type)
return document_type.metadata.filter(required=self.required_metadata)
@@ -185,9 +185,9 @@ class APIDocumentTypeMetadataTypeOptionalListView(generics.ListCreateAPIView):
document_type = get_object_or_404(DocumentType, pk=self.kwargs['document_type_pk'])
try:
Permission.objects.check_permissions(self.request.user, [PERMISSION_DOCUMENT_TYPE_EDIT])
Permission.objects.check_permissions(self.request.user, [permission_document_type_edit])
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_TYPE_EDIT, self.request.user, document_type)
AccessEntry.objects.check_access(permission_document_type_edit, self.request.user, document_type)
serializer = self.get_serializer(data=self.request.POST)
@@ -221,9 +221,9 @@ class APIDocumentTypeMetadataTypeRequiredView(views.APIView):
document_type = get_object_or_404(DocumentType, pk=self.kwargs['document_type_pk'])
try:
Permission.objects.check_permissions(self.request.user, [PERMISSION_DOCUMENT_TYPE_EDIT])
Permission.objects.check_permissions(self.request.user, [permission_document_type_edit])
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_TYPE_EDIT, self.request.user, document_type)
AccessEntry.objects.check_access(permission_document_type_edit, self.request.user, document_type)
metadata_type = get_object_or_404(MetadataType, pk=self.kwargs['metadata_type_pk'])
document_type.metadata_type.remove(metadata_type)