Split Permission and StoredPermission class and model into different modules. Simplified the Permission class.

mayan/apps/metadata/views.py

@@ -18,7 +18,7 @@ from documents.permissions import (
     permission_document_type_edit
 )
 from documents.views import DocumentListView
-from permissions.models import Permission
+from permissions import Permission
 
 from .api import save_metadata_list
 from .forms import (
@@ -48,7 +48,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
     documents = Document.objects.select_related('metadata').filter(pk__in=document_id_list.split(','))
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_metadata_document_edit])
+        Permission.check_permissions(request.user, [permission_metadata_document_edit])
     except PermissionDenied:
         documents = AccessEntry.objects.filter_objects_by_access(permission_metadata_document_edit, request.user, documents)
 
@@ -156,7 +156,7 @@ def metadata_add(request, document_id=None, document_id_list=None):
             return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_metadata_document_add])
+        Permission.check_permissions(request.user, [permission_metadata_document_add])
     except PermissionDenied:
         documents = AccessEntry.objects.filter_objects_by_access(permission_metadata_document_add, request.user, documents)
 
@@ -235,7 +235,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
     documents = Document.objects.select_related('metadata').filter(pk__in=document_id_list.split(','))
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_metadata_document_remove])
+        Permission.check_permissions(request.user, [permission_metadata_document_remove])
     except PermissionDenied:
         documents = AccessEntry.objects.filter_objects_by_access(permission_metadata_document_remove, request.user, documents)
 
@@ -329,7 +329,7 @@ def metadata_view(request, document_id):
     document = get_object_or_404(Document, pk=document_id)
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_metadata_document_view])
+        Permission.check_permissions(request.user, [permission_metadata_document_view])
     except PermissionDenied:
         AccessEntry.objects.check_access(permission_metadata_document_view, request.user, document)
 
@@ -347,7 +347,7 @@ def metadata_view(request, document_id):
 
 # Setup views
 def setup_metadata_type_list(request):
-    Permission.objects.check_permissions(request.user, [permission_metadata_type_view])
+    Permission.check_permissions(request.user, [permission_metadata_type_view])
 
     context = {
         'object_list': MetadataType.objects.all(),
@@ -366,7 +366,7 @@ def setup_metadata_type_list(request):
 
 
 def setup_metadata_type_edit(request, metadatatype_id):
-    Permission.objects.check_permissions(request.user, [permission_metadata_type_edit])
+    Permission.check_permissions(request.user, [permission_metadata_type_edit])
 
     metadata_type = get_object_or_404(MetadataType, pk=metadatatype_id)
 
@@ -391,7 +391,7 @@ def setup_metadata_type_edit(request, metadatatype_id):
 
 
 def setup_metadata_type_create(request):
-    Permission.objects.check_permissions(request.user, [permission_metadata_type_create])
+    Permission.check_permissions(request.user, [permission_metadata_type_create])
 
     if request.method == 'POST':
         form = MetadataTypeForm(request.POST)
@@ -409,7 +409,7 @@ def setup_metadata_type_create(request):
 
 
 def setup_metadata_type_delete(request, metadatatype_id):
-    Permission.objects.check_permissions(request.user, [permission_metadata_type_delete])
+    Permission.check_permissions(request.user, [permission_metadata_type_delete])
 
     metadata_type = get_object_or_404(MetadataType, pk=metadatatype_id)
 
@@ -447,7 +447,7 @@ class SetupDocumentTypeMetadataOptionalView(AssignRemoveView):
         self.document_type.metadata.create(metadata_type=item, required=False)
 
     def dispatch(self, request, *args, **kwargs):
-        Permission.objects.check_permissions(request.user, [permission_document_type_edit])
+        Permission.check_permissions(request.user, [permission_document_type_edit])
         self.document_type = get_object_or_404(DocumentType, pk=self.kwargs['document_type_id'])
         return super(SetupDocumentTypeMetadataOptionalView, self).dispatch(request, *args, **kwargs)