Reduce the check_access boilerplate code.

This commit is contained in:
Roberto Rosario
2016-11-02 04:58:05 -04:00
parent 621c988809
commit 5893e149e0
27 changed files with 364 additions and 705 deletions

View File

@@ -1,6 +1,5 @@
from __future__ import absolute_import, unicode_literals
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext_lazy as _
@@ -10,7 +9,6 @@ from common.generics import (
SingleObjectCreateView, SingleObjectDeleteView, SingleObjectListView
)
from documents.models import Document
from permissions import Permission
from .models import Comment
from .permissions import (
@@ -25,14 +23,10 @@ class DocumentCommentCreateView(SingleObjectCreateView):
object_verbose_name = _('Comment')
def dispatch(self, request, *args, **kwargs):
try:
Permission.check_permissions(
request.user, (permission_comment_create,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
permission_comment_create, request.user, self.get_document()
)
AccessControlList.objects.check_access(
permissions=permission_comment_create, user=request.user,
obj=self.get_document()
)
return super(
DocumentCommentCreateView, self
@@ -67,15 +61,10 @@ class DocumentCommentDeleteView(SingleObjectDeleteView):
model = Comment
def dispatch(self, request, *args, **kwargs):
try:
Permission.check_permissions(
request.user, (permission_comment_delete,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
permission_comment_delete, request.user,
self.get_object().document
)
AccessControlList.objects.check_access(
permissions=permission_comment_delete, user=request.user,
obj=self.get_object().document
)
return super(
DocumentCommentDeleteView, self
@@ -102,15 +91,10 @@ class DocumentCommentListView(SingleObjectListView):
return get_object_or_404(Document, pk=self.kwargs['pk'])
def get_queryset(self):
try:
Permission.check_permissions(
self.request.user, (permission_comment_view,)
)
except PermissionDenied:
AccessControlList.objects.check_access(
permission_comment_view, self.request.user,
self.get_document()
)
AccessControlList.objects.check_access(
permissions=permission_comment_view, user=self.request.user,
obj=self.get_document()
)
return self.get_document().comments.all()