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

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

Browse Source
This commit is contained in:
Roberto Rosario
2015-06-28 01:02:49 -04:00
parent d26402974a
commit 1c084aa07b
58 changed files with 354 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mayan/apps/sources/views.py
View File

@@ -22,7 +22,7 @@ from documents.permissions import (
from documents.tasks import task_upload_new_version
from metadata.api import decode_metadata_from_url
from navigation import Link
from permissions.models import Permission
from permissions import Permission
from .forms import (
NewDocumentForm, NewVersionForm
@@ -73,7 +73,7 @@ class SourceLogListView(ParentChildListView):
def document_create_siblings(request, document_id):
Permission.objects.check_permissions(request.user, [permission_document_create])
Permission.check_permissions(request.user, [permission_document_create])
document = get_object_or_404(Document, pk=document_id)
query_dict = {}
@@ -192,7 +192,7 @@ class UploadInteractiveView(UploadBaseView):
def dispatch(self, request, *args, **kwargs):
self.subtemplates_list = []
Permission.objects.check_permissions(request.user, [permission_document_create])
Permission.check_permissions(request.user, [permission_document_create])
self.document_type = get_object_or_404(DocumentType, pk=self.request.GET.get('document_type_id', self.request.POST.get('document_type_id')))
@@ -275,7 +275,7 @@ class UploadInteractiveVersionView(UploadBaseView):
self.document = get_object_or_404(Document, pk=kwargs['document_pk'])
try:
Permission.objects.check_permissions(self.request.user, [permission_document_new_version])
Permission.check_permissions(self.request.user, [permission_document_new_version])
except PermissionDenied:
AccessEntry.objects.check_access(permission_document_new_version, self.request.user, self.document)
@@ -336,7 +336,7 @@ class UploadInteractiveVersionView(UploadBaseView):
def staging_file_delete(request, staging_folder_pk, encoded_filename):
Permission.objects.check_permissions(request.user, [permission_document_create, permission_document_new_version])
Permission.check_permissions(request.user, [permission_document_create, permission_document_new_version])
staging_folder = get_object_or_404(StagingFolderSource, pk=staging_folder_pk)
staging_file = staging_folder.get_file(encoded_filename=encoded_filename)
@@ -365,7 +365,7 @@ def staging_file_delete(request, staging_folder_pk, encoded_filename):
# Setup views
def setup_source_list(request):
Permission.objects.check_permissions(request.user, [permission_sources_setup_view])
Permission.check_permissions(request.user, [permission_sources_setup_view])
context = {
'object_list': Source.objects.select_subclasses(),
@@ -388,7 +388,7 @@ def setup_source_list(request):
def setup_source_edit(request, source_id):
Permission.objects.check_permissions(request.user, [permission_sources_setup_edit])
Permission.check_permissions(request.user, [permission_sources_setup_edit])
source = get_object_or_404(Source.objects.select_subclasses(), pk=source_id)
form_class = get_form_class(source.source_type)
@@ -418,7 +418,7 @@ def setup_source_edit(request, source_id):
def setup_source_delete(request, source_id):
Permission.objects.check_permissions(request.user, [permission_sources_setup_delete])
Permission.check_permissions(request.user, [permission_sources_setup_delete])
source = get_object_or_404(Source.objects.select_subclasses(), pk=source_id)
redirect_view = reverse('sources:setup_source_list')
@@ -448,7 +448,7 @@ def setup_source_delete(request, source_id):
def setup_source_create(request, source_type):
Permission.objects.check_permissions(request.user, [permission_sources_setup_create])
Permission.check_permissions(request.user, [permission_sources_setup_create])
cls = get_class(source_type)
form_class = get_form_class(source_type)