From f96725de55985d0c4c22b8ac9bc5bdcbdbdf5612 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 23 May 2012 01:21:41 -0400 Subject: [PATCH] Remove the workflow state permissions --- apps/workflows/__init__.py | 12 +++++------- apps/workflows/views.py | 14 ++++++-------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/apps/workflows/__init__.py b/apps/workflows/__init__.py index d4a714a21e..c06c85ad8c 100644 --- a/apps/workflows/__init__.py +++ b/apps/workflows/__init__.py @@ -7,9 +7,7 @@ from navigation.api import Link, bind_links from .permissions import (PERMISSION_WORKFLOW_SETUP_VIEW, PERMISSION_WORKFLOW_SETUP_CREATE, PERMISSION_WORKFLOW_SETUP_EDIT, - PERMISSION_WORKFLOW_SETUP_DELETE, PERMISSION_STATE_SETUP_VIEW, - PERMISSION_STATE_SETUP_CREATE, PERMISSION_STATE_SETUP_EDIT, - PERMISSION_STATE_SETUP_DELETE) + PERMISSION_WORKFLOW_SETUP_DELETE) from .models import (Workflow, State, WorkflowState, WorkflowNode) @@ -26,10 +24,10 @@ setup_workflow_state_transitions_list_link = Link(text=_(u'workflow state transi setup_workflow_state_transition_add_link = Link(text=_(u'add workflow state transition'), view='setup_workflow_state_transition_add', args='workflow_state.pk', sprite='chart_line_add', permissions=[PERMISSION_WORKFLOW_SETUP_EDIT]) setup_workflow_state_transition_edit_link = Link(text=_(u'edit workflow state transition'), view='setup_workflow_state_transition_edit', args='workflow_state_transition.pk', sprite='chart_line_edit', permissions=[PERMISSION_WORKFLOW_SETUP_EDIT]) -setup_state_list_link = Link(text=_(u'state list'), view='setup_state_list', sprite='transmit', permissions=[PERMISSION_STATE_SETUP_VIEW]) -setup_state_create_link = Link(text=_(u'create new state'), view='setup_state_create', sprite='transmit_add', permissions=[PERMISSION_STATE_SETUP_CREATE]) -setup_state_edit_link = Link(text=_(u'edit'), view='setup_state_edit', args='object.pk', sprite='transmit_edit', permissions=[PERMISSION_STATE_SETUP_EDIT]) -setup_state_delete_link = Link(text=_(u'delete'), view='setup_state_delete', args='object.pk', sprite='transmit_delete', permissions=[PERMISSION_STATE_SETUP_DELETE]) +setup_state_list_link = Link(text=_(u'state list'), view='setup_state_list', sprite='transmit', permissions=[PERMISSION_WORKFLOW_SETUP_EDIT]) +setup_state_create_link = Link(text=_(u'create new state'), view='setup_state_create', sprite='transmit_add', permissions=[PERMISSION_WORKFLOW_SETUP_EDIT]) +setup_state_edit_link = Link(text=_(u'edit'), view='setup_state_edit', args='object.pk', sprite='transmit_edit', permissions=[PERMISSION_WORKFLOW_SETUP_EDIT]) +setup_state_delete_link = Link(text=_(u'delete'), view='setup_state_delete', args='object.pk', sprite='transmit_delete', permissions=[PERMISSION_WORKFLOW_SETUP_EDIT]) setup_workflow_node_list_link = Link(text=_(u'node list'), view='setup_workflow_node_list', args='workflow.pk', sprite='chart_line', permissions=[PERMISSION_WORKFLOW_SETUP_EDIT]) #setup_workflow_node_create_link = Link(text=_(u'create new transition'), view='setup_transition_create', sprite='chart_line_add', permissions=[PERMISSION_TRANSITION_SETUP_CREATE]) diff --git a/apps/workflows/views.py b/apps/workflows/views.py index 33c5a778b9..89a3ded131 100644 --- a/apps/workflows/views.py +++ b/apps/workflows/views.py @@ -23,9 +23,7 @@ from .forms import (WorkflowSetupForm, StateSetupForm, WorkflowStateSetupForm, WorkflowNodeSetupForm) from .permissions import (PERMISSION_WORKFLOW_SETUP_VIEW, PERMISSION_WORKFLOW_SETUP_CREATE, PERMISSION_WORKFLOW_SETUP_EDIT, - PERMISSION_WORKFLOW_SETUP_DELETE, PERMISSION_STATE_SETUP_VIEW, - PERMISSION_STATE_SETUP_CREATE, PERMISSION_STATE_SETUP_EDIT, - PERMISSION_STATE_SETUP_DELETE) + PERMISSION_WORKFLOW_SETUP_DELETE) logger = logging.getLogger(__name__) @@ -336,7 +334,7 @@ def setup_workflow_transition_list(request, state_workflow_pk): """ # States def setup_state_list(request): - Permission.objects.check_permissions(request.user, [PERMISSION_STATE_SETUP_VIEW]) + Permission.objects.check_permissions(request.user, [PERMISSION_WORKFLOW_SETUP_EDIT]) context = { 'object_list': State.objects.all(), @@ -349,7 +347,7 @@ def setup_state_list(request): def setup_state_create(request): - Permission.objects.check_permissions(request.user, [PERMISSION_STATE_SETUP_CREATE]) + Permission.objects.check_permissions(request.user, [PERMISSION_WORKFLOW_SETUP_EDIT]) redirect_url = reverse('setup_state_list') if request.method == 'POST': @@ -369,7 +367,7 @@ def setup_state_create(request): def setup_state_edit(request, state_pk): - Permission.objects.check_permissions(request.user, [PERMISSION_STATE_SETUP_EDIT]) + Permission.objects.check_permissions(request.user, [PERMISSION_WORKFLOW_SETUP_EDIT]) state = get_object_or_404(State, pk=state_pk) if request.method == 'POST': @@ -403,9 +401,9 @@ def setup_state_delete(request, state_pk=None, state_pk_list=None): return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) try: - Permission.objects.check_permissions(request.user, [PERMISSION_STATE_SETUP_DELETE]) + Permission.objects.check_permissions(request.user, [PERMISSION_WORKFLOW_SETUP_EDIT]) except PermissionDenied: - states = AccessEntry.objects.filter_objects_by_access(PERMISSION_STATE_SETUP_DELETE, request.user, states) + states = AccessEntry.objects.filter_objects_by_access(PERMISSION_WORKFLOW_SETUP_EDIT, request.user, states) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/')))