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

Code style cleanups

Browse Source 
Add keyword arguments. Sort arguments and models.
Move literals to their own module. Prepend handler_ to
signal handlers.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-04-26 03:32:35 -04:00
parent 20acc24c7f
commit 74c97314d7
160 changed files with 1029 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,8 +30,8 @@ class APICommentListView(generics.ListCreateAPIView):
)
AccessControlList.objects.check_access(
permissions=permission_required, user=self.request.user,
obj=document
obj=document, permissions=permission_required,
user=self.request.user
)
return document
@@ -85,8 +85,8 @@ class APICommentView(generics.RetrieveDestroyAPIView):
)
AccessControlList.objects.check_access(
permissions=permission_required, user=self.request.user,
obj=document
obj=document, permissions=permission_required,
user=self.request.user
)
return document

10
mayan/apps/document_comments/apps.py
View File

@@ -37,7 +37,7 @@ class DocumentCommentsApp(MayanAppConfig):
app_label='documents', model_name='Document'
)
Comment = self.get_model('Comment')
Comment = self.get_model(model_name='Comment')
ModelEventType.register(
model=Document, event_types=(
@@ -52,12 +52,12 @@ class DocumentCommentsApp(MayanAppConfig):
)
)
SourceColumn(source=Comment, label=_('Date'), attribute='submit_date')
SourceColumn(attribute='submit_date', source=Comment)
SourceColumn(
source=Comment, label=_('User'),
func=lambda context: context['object'].user.get_full_name() if context['object'].user.get_full_name() else context['object'].user
func=lambda context: context['object'].user.get_full_name() if context['object'].user.get_full_name() else context['object'].user,
source=Comment
)
SourceColumn(source=Comment, label=_('Comment'), attribute='comment')
SourceColumn(attribute='comment', source=Comment)
document_page_search.add_model_field(
field='document_version__document__comments__comment',

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

@@ -4,14 +4,14 @@ from django.utils.translation import ugettext_lazy as _
from mayan.apps.permissions import PermissionNamespace
namespace = PermissionNamespace(name='comments', label=_('Comments'))
namespace = PermissionNamespace(label=_('Comments'), name='comments')
permission_comment_create = namespace.add_permission(
name='comment_create', label=_('Create new comments')
label=_('Create new comments'), name='comment_create'
)
permission_comment_delete = namespace.add_permission(
name='comment_delete', label=_('Delete comments')
label=_('Delete comments'), name='comment_delete'
)
permission_comment_view = namespace.add_permission(
name='comment_view', label=_('View comments')
label=_('View comments'), name='comment_view'
)

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

@@ -26,8 +26,8 @@ class DocumentCommentCreateView(SingleObjectCreateView):
def dispatch(self, request, *args, **kwargs):
AccessControlList.objects.check_access(
permissions=permission_comment_create, user=request.user,
obj=self.get_document()
obj=self.get_document(), permissions=permission_comment_create,
user=request.user
)
return super(
@@ -66,8 +66,8 @@ class DocumentCommentDeleteView(SingleObjectDeleteView):
def dispatch(self, request, *args, **kwargs):
AccessControlList.objects.check_access(
permissions=permission_comment_delete, user=request.user,
obj=self.get_object().document
obj=self.get_object().document,
permissions=permission_comment_delete, user=request.user
)
return super(
@@ -116,8 +116,8 @@ class DocumentCommentListView(SingleObjectListView):
def get_object_list(self):
AccessControlList.objects.check_access(
permissions=permission_comment_view, user=self.request.user,
obj=self.get_document()
obj=self.get_document(), permissions=permission_comment_view,
user=self.request.user
)
return self.get_document().comments.all()