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

8
mayan/apps/document_comments/views.py
View File

@@ -14,7 +14,7 @@ from django.utils.translation import ugettext_lazy as _
from acls.models import AccessEntry
from documents.models import Document
from permissions.models import Permission
from permissions import Permission
from .forms import CommentForm
from .permissions import (
@@ -32,7 +32,7 @@ def comment_delete(request, comment_id=None, comment_id_list=None):
comments = [get_object_or_404(Comment, pk=comment_id) for comment_id in comment_id_list.split(',')]
try:
Permission.objects.check_permissions(request.user, [permission_comment_delete])
Permission.check_permissions(request.user, [permission_comment_delete])
except PermissionDenied:
comments = AccessEntry.objects.filter_objects_by_access(permission_comment_delete, request.user, comments, related='content_object')
@@ -80,7 +80,7 @@ def comment_add(request, document_id):
document = get_object_or_404(Document, pk=document_id)
try:
Permission.objects.check_permissions(request.user, [permission_comment_create])
Permission.check_permissions(request.user, [permission_comment_create])
except PermissionDenied:
AccessEntry.objects.check_access(permission_comment_create, request.user, document)
@@ -118,7 +118,7 @@ def comments_for_document(request, document_id):
document = get_object_or_404(Document, pk=document_id)
try:
Permission.objects.check_permissions(request.user, [permission_comment_view])
Permission.check_permissions(request.user, [permission_comment_view])
except PermissionDenied:
AccessEntry.objects.check_access(permission_comment_view, request.user, document)