From 43cf4b37b0ec60401cc9fdcf082a622f22625760 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 8 Dec 2011 16:43:30 -0400 Subject: [PATCH] Update the linking app to the new class based permissions --- apps/linking/__init__.py | 16 ++++++---------- apps/linking/views.py | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/apps/linking/__init__.py b/apps/linking/__init__.py index ab1bdc616a..f64337045e 100644 --- a/apps/linking/__init__.py +++ b/apps/linking/__init__.py @@ -1,23 +1,19 @@ from django.utils.translation import ugettext_lazy as _ from navigation.api import register_links, register_sidebar_template -from permissions.api import register_permission, set_namespace_title +from permissions.models import PermissionNamespace, Permission from project_setup.api import register_setup from documents.literals import PERMISSION_DOCUMENT_VIEW from documents.models import Document from linking.models import SmartLink, SmartLinkCondition -PERMISSION_SMART_LINK_VIEW = {'namespace': 'linking', 'name': 'smart_link_view', 'label': _(u'View existing smart links')} -PERMISSION_SMART_LINK_CREATE = {'namespace': 'linking', 'name': 'smart_link_create', 'label': _(u'Create new smart links')} -PERMISSION_SMART_LINK_DELETE = {'namespace': 'linking', 'name': 'smart_link_delete', 'label': _(u'Delete smart links')} -PERMISSION_SMART_LINK_EDIT = {'namespace': 'linking', 'name': 'smart_link_edit', 'label': _(u'Edit smart links')} +linking_namespace = PermissionNamespace('linking', _(u'Smart links')) -set_namespace_title('linking', _(u'Smart links')) -register_permission(PERMISSION_SMART_LINK_VIEW) -register_permission(PERMISSION_SMART_LINK_CREATE) -register_permission(PERMISSION_SMART_LINK_DELETE) -register_permission(PERMISSION_SMART_LINK_EDIT) +PERMISSION_SMART_LINK_VIEW = Permission.objects.register(linking_namespace, 'smart_link_view', _(u'View existing smart links')) +PERMISSION_SMART_LINK_CREATE = Permission.objects.register(linking_namespace, 'smart_link_create', _(u'Create new smart links')) +PERMISSION_SMART_LINK_DELETE = Permission.objects.register(linking_namespace, 'smart_link_delete', _(u'Delete smart links')) +PERMISSION_SMART_LINK_EDIT = Permission.objects.register(linking_namespace, 'smart_link_edit', _(u'Edit smart links')) smart_link_instance_view_link = {'text': _(u'smart links actions'), 'view': 'smart_link_instance_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]} smart_link_instances_for_document = {'text': _(u'smart links'), 'view': 'smart_link_instances_for_document', 'args': 'object.pk', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]} diff --git a/apps/linking/views.py b/apps/linking/views.py index 2b1770cb12..559f4dcea7 100644 --- a/apps/linking/views.py +++ b/apps/linking/views.py @@ -11,7 +11,7 @@ from common.widgets import two_state_template from documents.models import Document from documents.views import document_list -from permissions.api import check_permissions +from permissions.models import Permission from linking.models import SmartLink, SmartLinkCondition from linking.conf.settings import SHOW_EMPTY_SMART_LINKS @@ -24,7 +24,7 @@ from linking import (PERMISSION_SMART_LINK_VIEW, def smart_link_action(request): - check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW]) action = request.GET.get('action', None) @@ -36,7 +36,7 @@ def smart_link_action(request): def smart_link_instance_view(request, document_id, smart_link_pk): - check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW]) document = get_object_or_404(Document, pk=document_id) smart_link = get_object_or_404(SmartLink, pk=smart_link_pk) @@ -55,7 +55,7 @@ def smart_link_instance_view(request, document_id, smart_link_pk): def smart_link_instances_for_document(request, document_id): - check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_VIEW]) subtemplates_list = [] document = get_object_or_404(Document, pk=document_id) @@ -99,7 +99,7 @@ def smart_link_instances_for_document(request, document_id): def smart_link_list(request): - check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE]) return render_to_response('generic_list.html', { 'title': _(u'smart links'), @@ -115,7 +115,7 @@ def smart_link_list(request): def smart_link_create(request): - check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE]) if request.method == 'POST': form = SmartLinkForm(request.POST) @@ -133,7 +133,7 @@ def smart_link_create(request): def smart_link_edit(request, smart_link_pk): - check_permissions(request.user, [PERMISSION_SMART_LINK_EDIT]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_EDIT]) smart_link = get_object_or_404(SmartLink, pk=smart_link_pk) @@ -155,7 +155,7 @@ def smart_link_edit(request, smart_link_pk): def smart_link_delete(request, smart_link_pk): - check_permissions(request.user, [PERMISSION_SMART_LINK_DELETE]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_DELETE]) smart_link = get_object_or_404(SmartLink, pk=smart_link_pk) @@ -185,7 +185,7 @@ def smart_link_delete(request, smart_link_pk): def smart_link_condition_list(request, smart_link_pk): - check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]) smart_link = get_object_or_404(SmartLink, pk=smart_link_pk) @@ -203,7 +203,7 @@ def smart_link_condition_list(request, smart_link_pk): def smart_link_condition_create(request, smart_link_pk): - check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]) smart_link = get_object_or_404(SmartLink, pk=smart_link_pk) @@ -227,7 +227,7 @@ def smart_link_condition_create(request, smart_link_pk): def smart_link_condition_edit(request, smart_link_condition_pk): - check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]) smart_link_condition = get_object_or_404(SmartLinkCondition, pk=smart_link_condition_pk) @@ -261,7 +261,7 @@ def smart_link_condition_edit(request, smart_link_condition_pk): def smart_link_condition_delete(request, smart_link_condition_pk): - check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]) + Permission.objects.check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]) smart_link_condition = get_object_or_404(SmartLinkCondition, pk=smart_link_condition_pk)