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

PEP8 Cleanups.

Browse Source
This commit is contained in:
Roberto Rosario
2015-08-24 20:55:45 -04:00
parent f54c0d5058
commit 7392e80fc2
39 changed files with 1376 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mayan/apps/document_comments/models.py
View File

@@ -9,7 +9,9 @@ from django.utils.translation import ugettext_lazy as _
from documents.models import Document
from .events import event_document_comment_create, event_document_comment_delete
from .events import (
event_document_comment_create, event_document_comment_delete
)
logger = logging.getLogger(__name__)
@@ -43,16 +45,24 @@ class Comment(models.Model):
event_document_comment_create.commit(
actor=user, target=self.document
)
logger.info('Comment "%s" added to document "%s" by user "%s"', self.comment, self.document, user)
logger.info(
'Comment "%s" added to document "%s" by user "%s"',
self.comment, self.document, user
)
else:
event_document_comment_create.commit(target=self.document)
logger.info('Comment "%s" added to document "%s"', self.comment, self.document)
logger.info(
'Comment "%s" added to document "%s"', self.comment,
self.document
)
def delete(self, *args, **kwargs):
user = kwargs.pop('_user', None)
super(Comment, self).delete(*args, **kwargs)
if user:
event_document_comment_delete.commit(actor=user, target=self.document)
event_document_comment_delete.commit(
actor=user, target=self.document
)
else:
event_document_comment_delete.commit(target=self.document)

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

@@ -34,7 +34,9 @@ class DocumentCommentCreateView(SingleObjectCreateView):
permission_comment_create, request.user, self.get_document()
)
return super(DocumentCommentCreateView, self).dispatch(request, *args, **kwargs)
return super(
DocumentCommentCreateView, self
).dispatch(request, *args, **kwargs)
def get_document(self):
return get_object_or_404(Document, pk=self.kwargs['pk'])
@@ -66,10 +68,13 @@ class DocumentCommentDeleteView(SingleObjectDeleteView):
)
except PermissionDenied:
AccessControlList.objects.check_access(
permission_comment_delete, request.user, self.get_object().document
permission_comment_delete, request.user,
self.get_object().document
)
return super(DocumentCommentDeleteView, self).dispatch(request, *args, **kwargs)
return super(
DocumentCommentDeleteView, self
).dispatch(request, *args, **kwargs)
def get_delete_extra_data(self):
return {'_user': self.request.user}
@@ -82,7 +87,8 @@ class DocumentCommentDeleteView(SingleObjectDeleteView):
def get_post_action_redirect(self):
return reverse(
'comments:comments_for_document', args=(self.get_object().document.pk,)
'comments:comments_for_document',
args=(self.get_object().document.pk,)
)