From b60c8df9d6b8933714c307a72b964a303f2a904a Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 23 May 2014 19:56:05 -0400 Subject: [PATCH] Move document_comments app links to their module --- apps/document_comments/__init__.py | 18 ++++++++---------- apps/document_comments/links.py | 11 +++++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 apps/document_comments/links.py diff --git a/apps/document_comments/__init__.py b/apps/document_comments/__init__.py index 2356f36885..5f11dda8e0 100644 --- a/apps/document_comments/__init__.py +++ b/apps/document_comments/__init__.py @@ -1,25 +1,23 @@ 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 from django.contrib.contenttypes import generic +from django.utils.translation import ugettext_lazy as _ -from navigation.api import register_links, register_model_list_columns -from common.utils import encapsulate from acls.api import class_permissions +from common.utils import encapsulate from documents.models import Document +from navigation.api import register_links, register_model_list_columns + +from .links import (comment_delete, comment_add, + comments_for_document) +from .permissions import (PERMISSION_COMMENT_CREATE, + PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_VIEW) if 'django.contrib.comments' not in settings.INSTALLED_APPS: raise Exception('This app depends on the django.contrib.comments app.') -from .permissions import (PERMISSION_COMMENT_CREATE, - PERMISSION_COMMENT_DELETE, 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]} -comments_for_document = {'text': _('comments'), 'view': 'comments_for_document', 'args': 'object.pk', 'famfam': 'comments', 'permissions': [PERMISSION_COMMENT_VIEW], 'children_view_regex': ['comment']} register_model_list_columns(Comment, [ { diff --git a/apps/document_comments/links.py b/apps/document_comments/links.py new file mode 100644 index 0000000000..588e03ea07 --- /dev/null +++ b/apps/document_comments/links.py @@ -0,0 +1,11 @@ +from __future__ import absolute_import + +from django.utils.translation import ugettext_lazy as _ + +from .permissions import (PERMISSION_COMMENT_CREATE, + PERMISSION_COMMENT_DELETE, 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]} +comments_for_document = {'text': _('comments'), 'view': 'comments_for_document', 'args': 'object.pk', 'famfam': 'comments', 'permissions': [PERMISSION_COMMENT_VIEW], 'children_view_regex': ['comment']}