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

mayan/apps/document_indexing/views.py

@@ -18,7 +18,7 @@ from common.widgets import two_state_template
 from documents.models import Document
 from documents.permissions import permission_document_view
 from documents.views import document_list
-from permissions.models import Permission
+from permissions import Permission
 
 from .forms import IndexForm, IndexTemplateNodeForm
 from .models import Index, IndexInstanceNode, IndexTemplateNode
@@ -48,7 +48,7 @@ def index_setup_list(request):
     queryset = Index.objects.all()
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_document_indexing_setup])
+        Permission.check_permissions(request.user, [permission_document_indexing_setup])
     except PermissionDenied:
         queryset = AccessEntry.objects.filter_objects_by_access(permission_document_indexing_setup, request.user, queryset)
 
@@ -59,7 +59,7 @@ def index_setup_list(request):
 
 
 def index_setup_create(request):
-    Permission.objects.check_permissions(request.user, [permission_document_indexing_create])
+    Permission.check_permissions(request.user, [permission_document_indexing_create])
 
     if request.method == 'POST':
         form = IndexForm(request.POST)
@@ -81,7 +81,7 @@ def index_setup_edit(request, index_pk):
     index = get_object_or_404(Index, pk=index_pk)
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_document_indexing_edit])
+        Permission.check_permissions(request.user, [permission_document_indexing_edit])
     except PermissionDenied:
         AccessEntry.objects.check_access(permission_document_indexing_create, request.user, index)
 
@@ -106,7 +106,7 @@ def index_setup_delete(request, index_pk):
     index = get_object_or_404(Index, pk=index_pk)
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_document_indexing_delete])
+        Permission.check_permissions(request.user, [permission_document_indexing_delete])
     except PermissionDenied:
         AccessEntry.objects.check_access(permission_document_indexing_delete, request.user, index)
 
@@ -142,7 +142,7 @@ def index_setup_view(request, index_pk):
     index = get_object_or_404(Index, pk=index_pk)
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_document_indexing_setup])
+        Permission.check_permissions(request.user, [permission_document_indexing_setup])
     except PermissionDenied:
         AccessEntry.objects.check_access(permission_document_indexing_setup, request.user, index)
 
@@ -175,7 +175,7 @@ class SetupIndexDocumentTypesView(AssignRemoveView):
         self.index = get_object_or_404(Index, pk=self.kwargs['index_pk'])
 
         try:
-            Permission.objects.check_permissions(request.user, [permission_document_indexing_edit])
+            Permission.check_permissions(request.user, [permission_document_indexing_edit])
         except PermissionDenied:
             AccessEntry.objects.check_access(permission_document_indexing_edit, request.user, self.index)
 
@@ -208,7 +208,7 @@ def template_node_create(request, parent_pk):
     parent_node = get_object_or_404(IndexTemplateNode, pk=parent_pk)
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_document_indexing_edit])
+        Permission.check_permissions(request.user, [permission_document_indexing_edit])
     except PermissionDenied:
         AccessEntry.objects.check_access(permission_document_indexing_edit, request.user, parent_node.index)
 
@@ -233,7 +233,7 @@ def template_node_edit(request, node_pk):
     node = get_object_or_404(IndexTemplateNode, pk=node_pk)
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_document_indexing_edit])
+        Permission.check_permissions(request.user, [permission_document_indexing_edit])
     except PermissionDenied:
         AccessEntry.objects.check_access(permission_document_indexing_edit, request.user, node.index)
 
@@ -259,7 +259,7 @@ def template_node_delete(request, node_pk):
     node = get_object_or_404(IndexTemplateNode, pk=node_pk)
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_document_indexing_edit])
+        Permission.check_permissions(request.user, [permission_document_indexing_edit])
     except PermissionDenied:
         AccessEntry.objects.check_access(permission_document_indexing_edit, request.user, node.index)
 
@@ -309,7 +309,7 @@ def index_list(request):
     queryset = Index.objects.filter(enabled=True)
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_document_indexing_view])
+        Permission.check_permissions(request.user, [permission_document_indexing_view])
     except PermissionDenied:
         queryset = AccessEntry.objects.filter_objects_by_access(permission_document_indexing_view, request.user, queryset)
 
@@ -329,7 +329,7 @@ def index_instance_node_view(request, index_instance_node_pk):
     breadcrumbs = get_breadcrumbs(index_instance)
 
     try:
-        Permission.objects.check_permissions(request.user, [permission_document_indexing_view])
+        Permission.check_permissions(request.user, [permission_document_indexing_view])
     except PermissionDenied:
         AccessEntry.objects.check_access(permission_document_indexing_view, request.user, index_instance.index)
 
@@ -371,7 +371,7 @@ def rebuild_index_instances(request):
     """
     Confirmation view to execute the tool: do_rebuild_all_indexes
     """
-    Permission.objects.check_permissions(request.user, [permission_document_indexing_rebuild_indexes])
+    Permission.check_permissions(request.user, [permission_document_indexing_rebuild_indexes])
 
     previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
     next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))))
@@ -399,7 +399,7 @@ def document_index_list(request, document_id):
     queryset = document.node_instances.all()
     try:
         # TODO: should be AND not OR
-        Permission.objects.check_permissions(request.user, [permission_document_view, permission_document_indexing_view])
+        Permission.check_permissions(request.user, [permission_document_view, permission_document_indexing_view])
     except PermissionDenied:
         queryset = AccessEntry.objects.filter_objects_by_access(permission_document_indexing_view, request.user, queryset, related='index')