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

Rebalance permissions.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-01 20:58:16 -04:00
parent fd11a15bf3
commit c6ec9fbc33
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/document_indexing/links.py
View File

@@ -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')

4
mayan/apps/folders/views.py
View File

@@ -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)

5
mayan/apps/linking/views.py
View File

@@ -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