PEP8 cleanups, E501.
This commit is contained in:
@@ -38,10 +38,15 @@ class DocumentCommentsApp(MayanAppConfig):
|
||||
)
|
||||
)
|
||||
|
||||
ModelAttribute(Document, label=_('Comments'), name='comments', type_name='related')
|
||||
ModelAttribute(
|
||||
Document, label=_('Comments'), name='comments', type_name='related'
|
||||
)
|
||||
|
||||
SourceColumn(source=Comment, label=_('Date'), attribute='submit_date')
|
||||
SourceColumn(source=Comment, label=_('User'), attribute=encapsulate(lambda x: x.user.get_full_name() if x.user.get_full_name() else x.user))
|
||||
SourceColumn(
|
||||
source=Comment, label=_('User'),
|
||||
attribute=encapsulate(lambda x: x.user.get_full_name() if x.user.get_full_name() else x.user)
|
||||
)
|
||||
SourceColumn(source=Comment, label=_('Comment'), attribute='comment')
|
||||
|
||||
ModelPermission.register(
|
||||
@@ -51,6 +56,14 @@ class DocumentCommentsApp(MayanAppConfig):
|
||||
)
|
||||
)
|
||||
|
||||
menu_sidebar.bind_links(links=[link_comment_add], sources=['comments:comments_for_document', 'comments:comment_add', 'comments:comment_delete', 'comments:comment_multiple_delete'])
|
||||
menu_sidebar.bind_links(
|
||||
links=[link_comment_add],
|
||||
sources=[
|
||||
'comments:comments_for_document', 'comments:comment_add',
|
||||
'comments:comment_delete', 'comments:comment_multiple_delete'
|
||||
]
|
||||
)
|
||||
menu_object.bind_links(links=[link_comment_delete], sources=[Comment])
|
||||
menu_facet.bind_links(links=[link_comments_for_document], sources=[Document])
|
||||
menu_facet.bind_links(
|
||||
links=[link_comments_for_document], sources=[Document]
|
||||
)
|
||||
|
||||
@@ -9,7 +9,19 @@ from .permissions import (
|
||||
permission_comment_view
|
||||
)
|
||||
|
||||
link_comment_add = Link(permissions=[permission_comment_create], text=_('Add comment'), view='comments:comment_add', args='object.pk')
|
||||
link_comment_delete = Link(permissions=[permission_comment_delete], tags='dangerous', text=_('Delete'), view='comments:comment_delete', args='object.pk')
|
||||
link_comment_multiple_delete = Link(permissions=[permission_comment_delete], tags='dangerous', text=_('Delete'), view='comments:comment_multiple_delete', args='object.pk')
|
||||
link_comments_for_document = Link(permissions=[permission_comment_view], text=_('Comments'), view='comments:comments_for_document', args='object.pk')
|
||||
link_comment_add = Link(
|
||||
permissions=[permission_comment_create], text=_('Add comment'),
|
||||
view='comments:comment_add', args='object.pk'
|
||||
)
|
||||
link_comment_delete = Link(
|
||||
permissions=[permission_comment_delete], tags='dangerous',
|
||||
text=_('Delete'), view='comments:comment_delete', args='object.pk'
|
||||
)
|
||||
link_comment_multiple_delete = Link(
|
||||
permissions=[permission_comment_delete], tags='dangerous',
|
||||
text=_('Delete'), view='comments:comment_multiple_delete', args='object.pk'
|
||||
)
|
||||
link_comments_for_document = Link(
|
||||
permissions=[permission_comment_view], text=_('Comments'),
|
||||
view='comments:comments_for_document', args='object.pk'
|
||||
)
|
||||
|
||||
@@ -6,6 +6,12 @@ from permissions import PermissionNamespace
|
||||
|
||||
namespace = PermissionNamespace('comments', _('Comments'))
|
||||
|
||||
permission_comment_create = namespace.add_permission(name='comment_create', label=_('Create new comments'))
|
||||
permission_comment_delete = namespace.add_permission(name='comment_delete', label=_('Delete comments'))
|
||||
permission_comment_view = namespace.add_permission(name='comment_view', label=_('View comments'))
|
||||
permission_comment_create = namespace.add_permission(
|
||||
name='comment_create', label=_('Create new comments')
|
||||
)
|
||||
permission_comment_delete = namespace.add_permission(
|
||||
name='comment_delete', label=_('Delete comments')
|
||||
)
|
||||
permission_comment_view = namespace.add_permission(
|
||||
name='comment_view', label=_('View comments')
|
||||
)
|
||||
|
||||
@@ -4,8 +4,20 @@ from django.conf.urls import patterns, url
|
||||
|
||||
urlpatterns = patterns(
|
||||
'document_comments.views',
|
||||
url(r'^comment/(?P<comment_id>\d+)/delete/$', 'comment_delete', name='comment_delete'),
|
||||
url(r'^comment/multiple/delete/$', 'comment_multiple_delete', name='comment_multiple_delete'),
|
||||
url(r'^(?P<document_id>\d+)/comment/add/$', 'comment_add', name='comment_add'),
|
||||
url(r'^(?P<document_id>\d+)/comment/list/$', 'comments_for_document', name='comments_for_document'),
|
||||
url(
|
||||
r'^comment/(?P<comment_id>\d+)/delete/$', 'comment_delete',
|
||||
name='comment_delete'
|
||||
),
|
||||
url(
|
||||
r'^comment/multiple/delete/$', 'comment_multiple_delete',
|
||||
name='comment_multiple_delete'
|
||||
),
|
||||
url(
|
||||
r'^(?P<document_id>\d+)/comment/add/$', 'comment_add',
|
||||
name='comment_add'
|
||||
),
|
||||
url(
|
||||
r'^(?P<document_id>\d+)/comment/list/$', 'comments_for_document',
|
||||
name='comments_for_document'
|
||||
),
|
||||
)
|
||||
|
||||
@@ -82,7 +82,9 @@ def comment_add(request, document_id):
|
||||
try:
|
||||
Permission.check_permissions(request.user, [permission_comment_create])
|
||||
except PermissionDenied:
|
||||
AccessControlList.objects.check_access(permission_comment_create, request.user, document)
|
||||
AccessControlList.objects.check_access(
|
||||
permission_comment_create, request.user, document
|
||||
)
|
||||
|
||||
post_action_redirect = None
|
||||
|
||||
@@ -120,7 +122,9 @@ def comments_for_document(request, document_id):
|
||||
try:
|
||||
Permission.check_permissions(request.user, [permission_comment_view])
|
||||
except PermissionDenied:
|
||||
AccessControlList.objects.check_access(permission_comment_view, request.user, document)
|
||||
AccessControlList.objects.check_access(
|
||||
permission_comment_view, request.user, document
|
||||
)
|
||||
|
||||
return render_to_response('appearance/generic_list.html', {
|
||||
'object': document,
|
||||
|
||||
Reference in New Issue
Block a user