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

Cleanups, permissions separation into explicit module, absolute import update

Browse Source
This commit is contained in:
Roberto Rosario
2012-01-02 03:48:26 -04:00
parent 2781a211ec
commit 34311fb17e
107 changed files with 693 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/document_comments/__init__.py
View File

@@ -1,3 +1,5 @@
from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from django.conf import settings
from django.contrib.comments.models import Comment
@@ -12,13 +14,10 @@ from documents.models import Document
if 'django.contrib.comments' not in settings.INSTALLED_APPS:
raise Exception('This app depends on the django.contrib.comments app.')
comments_namespace = PermissionNamespace('comments', _(u'Comments'))
PERMISSION_COMMENT_CREATE = Permission.objects.register(comments_namespace, 'comment_create', _(u'Create new comments'))
PERMISSION_COMMENT_DELETE = Permission.objects.register(comments_namespace, 'comment_delete', _(u'Delete comments'))
PERMISSION_COMMENT_EDIT = Permission.objects.register(comments_namespace, 'comment_edit', _(u'Edit comments'))
PERMISSION_COMMENT_VIEW = Permission.objects.register(comments_namespace, 'comment_view', _(u'View comments'))
from .permissions import (PERMISSION_COMMENT_CREATE,
PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_EDIT,
PERMISSION_COMMENT_VIEW)
comment_delete = {'text': _('delete'), 'view': 'comment_delete', 'args': 'object.pk', 'famfam': 'comment_delete', 'permissions': [PERMISSION_COMMENT_DELETE]}
comment_multiple_delete = {'text': _('delete'), 'view': 'comment_multiple_delete', 'args': 'object.pk', 'famfam': 'comments_delete', 'permissions': [PERMISSION_COMMENT_DELETE]}
comment_add = {'text': _('add comment'), 'view': 'comment_add', 'args': 'object.pk', 'famfam': 'comment_add', 'permissions': [PERMISSION_COMMENT_CREATE]}

12
apps/document_comments/permissions.py Normal file
View File

@@ -0,0 +1,12 @@
from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from permissions.models import PermissionNamespace, Permission
comments_namespace = PermissionNamespace('comments', _(u'Comments'))
PERMISSION_COMMENT_CREATE = Permission.objects.register(comments_namespace, 'comment_create', _(u'Create new comments'))
PERMISSION_COMMENT_DELETE = Permission.objects.register(comments_namespace, 'comment_delete', _(u'Delete comments'))
PERMISSION_COMMENT_EDIT = Permission.objects.register(comments_namespace, 'comment_edit', _(u'Edit comments'))
PERMISSION_COMMENT_VIEW = Permission.objects.register(comments_namespace, 'comment_view', _(u'View comments'))

4
apps/document_comments/utils.py
View File

@@ -1,6 +1,8 @@
from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from django.contrib.comments.models import Comment
from document_comments import comment_delete
from . import comment_delete
def get_comments_subtemplate(obj):

13
apps/document_comments/views.py
View File

@@ -1,3 +1,5 @@
from __future__ import absolute_import
from django.shortcuts import render_to_response, get_object_or_404
from django.utils.translation import ugettext_lazy as _
from django.contrib.comments.models import Comment
@@ -10,9 +12,10 @@ from django.contrib.sites.models import Site
from permissions.models import Permission
from documents.models import Document
from document_comments import PERMISSION_COMMENT_DELETE, \
PERMISSION_COMMENT_CREATE, PERMISSION_COMMENT_VIEW
from document_comments.forms import CommentForm
from .permissions import (PERMISSION_COMMENT_CREATE,
PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_EDIT,
PERMISSION_COMMENT_VIEW)
from .forms import CommentForm
def comment_delete(request, comment_id=None, comment_id_list=None):
@@ -97,9 +100,9 @@ def comment_add(request, document_id):
def comments_for_object(request, document_id):
"""
'''
Show a list of all the comments related to the passed object
"""
'''
Permission.objects.check_permissions(request.user, [PERMISSION_COMMENT_VIEW])
document = get_object_or_404(Document, pk=document_id)