From c6ec9fbc33c89e43b260a07ca0a33e26745722c0 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 1 Jul 2015 20:58:16 -0400 Subject: [PATCH] Rebalance permissions. --- mayan/apps/document_indexing/links.py | 2 +- mayan/apps/folders/views.py | 4 ++-- mayan/apps/linking/views.py | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mayan/apps/document_indexing/links.py b/mayan/apps/document_indexing/links.py index b7413ce507..bec136cf00 100644 --- a/mayan/apps/document_indexing/links.py +++ b/mayan/apps/document_indexing/links.py @@ -21,7 +21,7 @@ def is_not_root_node(context): return not context['resolved_object'].is_root_node() -link_document_index_list = Link(permissions=[permission_document_indexing_view, permission_document_view], text=_('Indexes'), view='indexing:document_index_list', args='object.pk') +link_document_index_list = Link(permissions=[permission_document_view], text=_('Indexes'), view='indexing:document_index_list', args='object.pk') link_index_list = Link(permissions=[permission_document_indexing_view], text=_('Index list'), view='indexing:index_list') link_index_main_menu = Link(icon='fa fa-list-ul', text=_('Indexes'), view='indexing:index_list') link_index_parent = Link(condition=is_not_instance_root_node, permissions=[permission_document_indexing_view], text=_('Go up one level'), view='indexing:index_instance_node_view', args='object.parent.pk') diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py index ff119de5e8..7b941ea6c1 100644 --- a/mayan/apps/folders/views.py +++ b/mayan/apps/folders/views.py @@ -211,9 +211,9 @@ class DocumentFolderListView(FolderListView): self.document = get_object_or_404(Document, pk=self.kwargs['pk']) try: - Permission.check_permissions(request.user, [permission_folder_view]) + Permission.check_permissions(request.user, [permission_document_view]) except PermissionDenied: - AccessControlList.objects.check_access(permission_folder_view, request.user, self.document) + AccessControlList.objects.check_access(permission_document_view, request.user, self.document) return super(DocumentFolderListView, self).dispatch(request, *args, **kwargs) diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index 4b2a7c9e76..21dfea35c2 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -16,6 +16,7 @@ from common.utils import encapsulate from common.views import AssignRemoveView from common.widgets import two_state_template from documents.models import Document, DocumentType +from documents.permissions import permission_document_view from documents.views import document_list from permissions import Permission @@ -96,9 +97,9 @@ def smart_link_instances_for_document(request, document_id): queryset = ResolvedSmartLink.objects.filter(document_types=document.document_type) try: - Permission.check_permissions(request.user, (permission_smart_link_view,)) + Permission.check_permissions(request.user, (permission_document_view,)) except PermissionDenied: - smart_links = AccessControlList.objects.filter_by_access(permission_smart_link_view, request.user, queryset) + smart_links = AccessControlList.objects.filter_by_access(permission_document_view, request.user, queryset) else: smart_links = queryset