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

Allow registering permission from the permission namespace. Replace all permission variables to be lowercase (style guide reserver uppercase variables for constants and literals).

Browse Source
This commit is contained in:
Roberto Rosario
2015-06-28 00:19:49 -04:00
parent 956ca08cbd
commit d26402974a
82 changed files with 898 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,8 +15,8 @@ from .links import (
link_comment_add, link_comment_delete, link_comments_for_document
)
from .permissions import (
PERMISSION_COMMENT_CREATE, PERMISSION_COMMENT_DELETE,
PERMISSION_COMMENT_VIEW
permission_comment_create, permission_comment_delete,
permission_comment_view
)
@@ -45,9 +45,9 @@ class DocumentCommentsApp(MayanAppConfig):
SourceColumn(source=Comment, label=_('Comment'), attribute='comment')
class_permissions(Document, [
PERMISSION_COMMENT_CREATE,
PERMISSION_COMMENT_DELETE,
PERMISSION_COMMENT_VIEW]
permission_comment_create,
permission_comment_delete,
permission_comment_view]
)
menu_sidebar.bind_links(links=[link_comment_add], sources=['comments:comments_for_document', 'comments:comment_add', 'comments:comment_delete', 'comments:comment_multiple_delete'])

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

@@ -5,11 +5,11 @@ from django.utils.translation import ugettext_lazy as _
from navigation import Link
from .permissions import (
PERMISSION_COMMENT_CREATE, PERMISSION_COMMENT_DELETE,
PERMISSION_COMMENT_VIEW
permission_comment_create, permission_comment_delete,
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')

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

@@ -2,10 +2,10 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
from permissions.models import PermissionNamespace, Permission
from permissions.models import PermissionNamespace
comments_namespace = PermissionNamespace('comments', _('Comments'))
namespace = PermissionNamespace('comments', _('Comments'))
PERMISSION_COMMENT_CREATE = Permission.objects.register(comments_namespace, 'comment_create', _('Create new comments'))
PERMISSION_COMMENT_DELETE = Permission.objects.register(comments_namespace, 'comment_delete', _('Delete comments'))
PERMISSION_COMMENT_VIEW = Permission.objects.register(comments_namespace, 'comment_view', _('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'))

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

@@ -18,8 +18,8 @@ from permissions.models import Permission
from .forms import CommentForm
from .permissions import (
PERMISSION_COMMENT_CREATE, PERMISSION_COMMENT_DELETE,
PERMISSION_COMMENT_VIEW
permission_comment_create, permission_comment_delete,
permission_comment_view
)
@@ -32,9 +32,9 @@ 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.objects.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')
comments = AccessEntry.objects.filter_objects_by_access(permission_comment_delete, request.user, comments, related='content_object')
if not comments:
messages.error(request, _('Must provide at least one comment.'))
@@ -80,9 +80,9 @@ 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.objects.check_permissions(request.user, [permission_comment_create])
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_COMMENT_CREATE, request.user, document)
AccessEntry.objects.check_access(permission_comment_create, request.user, document)
post_action_redirect = None
@@ -118,9 +118,9 @@ 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.objects.check_permissions(request.user, [permission_comment_view])
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_COMMENT_VIEW, request.user, document)
AccessEntry.objects.check_access(permission_comment_view, request.user, document)
return render_to_response('appearance/generic_list.html', {
'object': document,