From 89aeb8ad7cacf8901066a29957e2964d6cf18e79 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 16 Mar 2012 01:55:21 -0400 Subject: [PATCH] Added state list, create, edit, delete views --- apps/workflows/__init__.py | 19 ++- apps/workflows/forms.py | 7 +- apps/workflows/permissions.py | 16 ++- .../static/images/icons/transmit_delete.png | Bin 0 -> 2575 bytes apps/workflows/urls.py | 5 + apps/workflows/views.py | 119 +++++++++++++++++- 6 files changed, 153 insertions(+), 13 deletions(-) create mode 100644 apps/workflows/static/images/icons/transmit_delete.png diff --git a/apps/workflows/__init__.py b/apps/workflows/__init__.py index 898fdeed25..4521dc5142 100644 --- a/apps/workflows/__init__.py +++ b/apps/workflows/__init__.py @@ -7,8 +7,10 @@ from project_setup.api import register_setup from .permissions import (PERMISSION_WORKFLOW_SETUP_VIEW, PERMISSION_WORKFLOW_SETUP_CREATE, PERMISSION_WORKFLOW_SETUP_EDIT, - PERMISSION_WORKFLOW_SETUP_DELETE) -from .models import Workflow + PERMISSION_WORKFLOW_SETUP_DELETE, PERMISSION_STATE_SETUP_VIEW, + PERMISSION_STATE_SETUP_CREATE, PERMISSION_STATE_SETUP_EDIT, + PERMISSION_STATE_SETUP_DELETE) +from .models import Workflow, State, Transition setup_workflow_link = {'text': _(u'workflows'), 'view': 'setup_workflow_list', 'icon': 'chart_organisation.png', 'permissions': [PERMISSION_WORKFLOW_SETUP_VIEW]} @@ -17,9 +19,18 @@ setup_workflow_create_link = {'text': _(u'create new'), 'view': 'setup_workflow_ setup_workflow_edit_link = {'text': _(u'edit'), 'view': 'setup_workflow_edit', 'args': 'object.pk', 'famfam': 'chart_organisation', 'permissions': [PERMISSION_WORKFLOW_SETUP_EDIT]} setup_workflow_delete_link = {'text': _(u'delete'), 'view': 'setup_workflow_delete', 'args': 'object.pk', 'famfam': 'chart_organisation_delete', 'permissions': [PERMISSION_WORKFLOW_SETUP_DELETE]} +setup_state_list_link = {'text': _(u'state list'), 'view': 'setup_state_list', 'famfam': 'transmit', 'permissions': [PERMISSION_STATE_SETUP_VIEW]} +setup_state_create_link = {'text': _(u'create new'), 'view': 'setup_state_create', 'famfam': 'transmit_add', 'permissions': [PERMISSION_STATE_SETUP_CREATE]} +setup_state_edit_link = {'text': _(u'edit'), 'view': 'setup_state_edit', 'args': 'object.pk', 'famfam': 'transmit_edit', 'permissions': [PERMISSION_STATE_SETUP_EDIT]} +setup_state_delete_link = {'text': _(u'delete'), 'view': 'setup_state_delete', 'args': 'object.pk', 'famfam': 'transmit_delete', 'permissions': [PERMISSION_STATE_SETUP_DELETE]} + register_links(Workflow, [setup_workflow_edit_link, setup_workflow_delete_link]) -register_links([Workflow, 'setup_workflow_list', 'setup_workflow_create'], [setup_workflow_list_link], menu_name=u'form_header') +register_links([Workflow, State, 'setup_workflow_list', 'setup_workflow_create', 'setup_state_list'], [setup_workflow_list_link], menu_name=u'form_header') register_links([Workflow, 'setup_workflow_list', 'setup_workflow_create'], [setup_workflow_create_link], menu_name=u'secondary_menu') -#register_multi_item_links(['user_list'], [user_multiple_set_password, user_multiple_delete]) + +register_links(State, [setup_state_edit_link, setup_state_delete_link]) +register_links([State, Workflow, 'setup_state_list', 'setup_workflow_list', 'setup_workflow_create'], [setup_state_list_link], menu_name=u'form_header') +register_links([State, 'setup_state_list', 'setup_state_create'], [setup_state_create_link], menu_name=u'secondary_menu') + register_setup(setup_workflow_link) diff --git a/apps/workflows/forms.py b/apps/workflows/forms.py index 800affbb35..fd425d4883 100644 --- a/apps/workflows/forms.py +++ b/apps/workflows/forms.py @@ -3,9 +3,14 @@ from __future__ import absolute_import from django import forms from django.utils.translation import ugettext_lazy as _ -from .models import Workflow +from .models import Workflow, State, Transition class WorkflowSetupForm(forms.ModelForm): class Meta: model = Workflow + + +class StateSetupForm(forms.ModelForm): + class Meta: + model = State diff --git a/apps/workflows/permissions.py b/apps/workflows/permissions.py index 89003b2e84..dcce9281bd 100644 --- a/apps/workflows/permissions.py +++ b/apps/workflows/permissions.py @@ -4,9 +4,15 @@ from django.utils.translation import ugettext_lazy as _ from permissions.models import PermissionNamespace, Permission -user_management_namespace = PermissionNamespace('workflows', _(u'Workflows')) +namespace = PermissionNamespace('workflows', _(u'Workflows')) + +PERMISSION_WORKFLOW_SETUP_VIEW = Permission.objects.register(namespace, 'workflow_setup_view', _(u'View existing workflow templates')) +PERMISSION_WORKFLOW_SETUP_CREATE = Permission.objects.register(namespace, 'workflow_setup_create', _(u'Create new workflow templates')) +PERMISSION_WORKFLOW_SETUP_EDIT = Permission.objects.register(namespace, 'workflow_setup_edit', _(u'Edit existing workflow templates')) +PERMISSION_WORKFLOW_SETUP_DELETE = Permission.objects.register(namespace, 'workflow_setup_delete', _(u'Delete existing workflow templates')) + +PERMISSION_STATE_SETUP_VIEW = Permission.objects.register(namespace, 'state_setup_view', _(u'View existing states')) +PERMISSION_STATE_SETUP_CREATE = Permission.objects.register(namespace, 'state_setup_create', _(u'Create new state templates')) +PERMISSION_STATE_SETUP_EDIT = Permission.objects.register(namespace, 'state_setup_edit', _(u'Edit existing state templates')) +PERMISSION_STATE_SETUP_DELETE = Permission.objects.register(namespace, 'state_setup_delete', _(u'Delete existing state templates')) -PERMISSION_WORKFLOW_SETUP_VIEW = Permission.objects.register(user_management_namespace, 'workflow_setup_view', _(u'View existing workflow templates')) -PERMISSION_WORKFLOW_SETUP_CREATE = Permission.objects.register(user_management_namespace, 'workflow_setup_create', _(u'Create new workflow templates')) -PERMISSION_WORKFLOW_SETUP_EDIT = Permission.objects.register(user_management_namespace, 'workflow_setup_edit', _(u'Edit existing workflow templates')) -PERMISSION_WORKFLOW_SETUP_DELETE = Permission.objects.register(user_management_namespace, 'workflow_setup_delete', _(u'Delete existing workflow templates')) diff --git a/apps/workflows/static/images/icons/transmit_delete.png b/apps/workflows/static/images/icons/transmit_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..f34531ca7867129faaa58ff379592de2047c00d5 GIT binary patch literal 2575 zcmV+q3h?!bP)a_kHi}IlFh`8Ugjr{Ihre|3ByZ{_~&LW#C&rdmo;XJGD@^ zTFWsjSq5g&9Lur5X*ozl5~)410*!G=+3j-2cHFhCE%3$}K>@8!n<8hl6FCmVp-~ua^FTB%ZJ+sU(^}jneHQ{6 z*QQzBCaZD6gz6$t5ZK%8gTPP_27}3lmZ8Y;&)Y*yJeL+vN(wBRY^tp;HY}Ww%g?bC z=Yp-=3Jek%Y#D}-PaK@Op|KpdCcX^;P3x~~yNVpP5=*HCgdqVu7e?Sjhw!KSc6RK- z^$-pLM>OkH91cAWGY-=`^;Hips50MguPgv_u^9q=0T}M|4orKdsbV|{=4;^3)%Fxs z3m;0>cA>`=LK~J#xG=)Mhtpgijuuy1}etZ{`@LRLN2zDN3IZlMgO^)wRhZ zB+LsPrYYNhSh2OJ#9UZ7r2qm0K^X4x4^7+HRF+L5n*euuL(Q9og~s{`QwzY|;RDZ5 z$W!~A^ZU3q*s!7I>AW0nwYeY%Og0nfjGC`7kBJEgc|#zKpc96r9dkB0x8U@Irj0fG z?8PQ~VU-mIT_fOji#xB})-iLQ zzQk5x!PsL!^okG(#zB$NH^6Wl7;?2>v>8*e=(5L95g)3t9gLJ%e%j6^i0o4>=4P44$?(BNjG5-7GaVM z5#ZHGMh8^DIS@Wdj;-a{5}sEe9+BW=xA;EJ`Lp7eR}=*Tf&e_$1bR>FNj7|e3GbpFS16NC^}L>`o{ zmKypOO)5&ijC*h+Flx!jHE>bFAiZh=VAzb5j4`bs7|Sq9hJdWbxk1B96$Z^;-a-zJoalzAf!J?> z-qyq!!X^TV4sZ0cWFo}{Nl0+?shK~en8&znRbxLBewy;~^1t4;{5EhlH-kSA0Dn+` z;azV)+44Ie@!0{8hWmll>w(p3fJOgE4SL5p+1-zOK8DKW%OKRKm@@?8Kib*x9(h7I zqz5qyzPcBh-&7k8AuIgY`qgWmShQ$SjezkV3&-qQQjgW7*L9){Y3`Gv! zIfO+VA$5qUIa-rCTftgjfjk{oM;7H(0KqjJea~UjEuXRR>@xf>swN+M=FXj8;BZuK zsjR4g-u`|#ed;tE{QH5&C5Dk#nfN_SZ)d74vg|)|*)BJ5`&?jpJ2H8I=T)H4Pu}g? zf{nyWRDvmQkBfUv-8FT4=gpf3Lv9Z=HaWrNYTe!DYCTR)sa)ki2|vcW{u|ry)E?Zc zrXYsN>gf!sQ%1*SJ?01Z-go=;*I&PH=FA!39q~hZdmC_=fGBY!w0gMq51V1m>>BJv zWRRl~Y+{ozK0Oi?L;j#QU6^n%r91xcq**9PV5?Jt8QD0O>B0}xC~4cQ&hCBF?Ge&o^Dr{l>r zS}hztbQt>a{#h~~lh!JsCG4^RjDv2l6&K+twJA$n!~khIe7XlcaL_&a+p&)5QXegM z-*fNPc6(v{q|!;y*Vjkjkw5O-e&h+%60NN*Yc}sYp}~;kc5({lBtu^pnmbB zvl-fh;)lQQ9QY3|MJ`7`XSEg_nSJH#RKhuS^cb8yb9x=lyDoBFx(Ci)cxLw;o=rA3 zEt_0k1~v@Kw2xCRPJ-9#h4!uDvGEq5&|TTk_Vfc~g$I_$r6+AIu8QpMhLNPy_~D>$+nyfx=c*10b>(v3hWR)u z)!$U7qo!ry5+9pH0{e2Xsl%A5HCayXRZlLC|1P-Lqg9n?)LcQ~8M)L)X4YY~YDjCc l^ebv;N7TcN9pL{03;\d+)/edit/$', 'setup_workflow_edit', (), 'setup_workflow_edit'), url(r'^setup/workflow/(?P\d+)/delete/$', 'setup_workflow_delete', (), 'setup_workflow_delete'), + + url(r'^setup/state/list/$', 'setup_state_list', (), 'setup_state_list'), + url(r'^setup/state/create/$', 'setup_state_create', (), 'setup_state_create'), + url(r'^setup/state/(?P\d+)/edit/$', 'setup_state_edit', (), 'setup_state_edit'), + url(r'^setup/state/(?P\d+)/delete/$', 'setup_state_delete', (), 'setup_state_delete'), ) diff --git a/apps/workflows/views.py b/apps/workflows/views.py index cb4d373874..1db556df9e 100644 --- a/apps/workflows/views.py +++ b/apps/workflows/views.py @@ -18,11 +18,13 @@ from common.utils import encapsulate #from common.widgets import two_state_template #from acls.models import AccessEntry -from .models import Workflow -from .forms import WorkflowSetupForm +from .models import Workflow, State, Transition +from .forms import WorkflowSetupForm, StateSetupForm from .permissions import (PERMISSION_WORKFLOW_SETUP_VIEW, PERMISSION_WORKFLOW_SETUP_CREATE, PERMISSION_WORKFLOW_SETUP_EDIT, - PERMISSION_WORKFLOW_SETUP_DELETE) + PERMISSION_WORKFLOW_SETUP_DELETE, PERMISSION_STATE_SETUP_VIEW, + PERMISSION_STATE_SETUP_CREATE, PERMISSION_STATE_SETUP_EDIT, + PERMISSION_STATE_SETUP_DELETE) logger = logging.getLogger(__name__) @@ -139,3 +141,114 @@ def setup_workflow_delete(request, workflow_pk=None, workflow_pk_list=None): return render_to_response('generic_confirm.html', context, context_instance=RequestContext(request)) + +# States +def setup_state_list(request): + Permission.objects.check_permissions(request.user, [PERMISSION_STATE_SETUP_VIEW]) + + context = { + 'object_list': State.objects.all(), + 'title': _(u'states'), + 'hide_link': True, + #'list_object_variable_name': 'source', + #'source_type': source_type, + #'extra_columns': [ + # {'name': _(u'Initial state'), 'attribute': encapsulate(lambda workflow: workflow.initial_state or _(u'None'))}, + #], + } + + return render_to_response('generic_list.html', context, + context_instance=RequestContext(request)) + + +def setup_state_create(request): + Permission.objects.check_permissions(request.user, [PERMISSION_STATE_SETUP_CREATE]) + redirect_url = reverse('setup_state_list') + + if request.method == 'POST': + form = StateSetupForm(request.POST) + if form.is_valid(): + state = form.save() + messages.success(request, _(u'State created succesfully.')) + return HttpResponseRedirect(redirect_url) + else: + form = StateSetupForm() + + return render_to_response('generic_form.html', { + 'title': _(u'create state'), + 'form': form, + }, + context_instance=RequestContext(request)) + + +def setup_state_edit(request, state_pk): + Permission.objects.check_permissions(request.user, [PERMISSION_STATE_SETUP_EDIT]) + state = get_object_or_404(State, pk=state_pk) + + if request.method == 'POST': + form = StateSetupForm(instance=state, data=request.POST) + if form.is_valid(): + form.save() + messages.success(request, _(u'State "%s" updated successfully.') % state) + return HttpResponseRedirect(reverse('setup_state_list')) + else: + form = StateSetupForm(instance=state) + + return render_to_response('generic_form.html', { + 'title': _(u'edit state: %s') % state, + 'form': form, + 'object': state, + 'object_name': _(u'state'), + }, + context_instance=RequestContext(request)) + + +def setup_state_delete(request, state_pk=None, state_pk_list=None): + post_action_redirect = None + + if state_pk: + states = [get_object_or_404(State, pk=state_pk)] + post_action_redirect = reverse('setup_state_list') + elif state_pk_list: + states = [get_object_or_404(State, pk=state_pk) for state_pk in state_pk_list.split(',')] + else: + messages.error(request, _(u'Must provide at least one state.')) + return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) + + try: + Permission.objects.check_permissions(request.user, [PERMISSION_STATE_SETUP_DELETE]) + except PermissionDenied: + states = AccessEntry.objects.filter_objects_by_access(PERMISSION_STATE_SETUP_DELETE, 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', '/'))) + + if request.method == 'POST': + for state in states: + try: + state.delete() + messages.success(request, _(u'States "%s" deleted successfully.') % state) + except Exception, e: + messages.error(request, _(u'Error deleting state "%(state)s": %(error)s') % { + 'state': state, 'error': e + }) + + return HttpResponseRedirect(next) + + context = { + 'object_name': _(u'state'), + 'delete_view': True, + 'previous': previous, + 'next': next, + 'form_icon': u'transmit_delete.png', + } + if len(states) == 1: + context['object'] = states[0] + context['title'] = _(u'Are you sure you wish to delete the state: %s?') % ', '.join([unicode(d) for d in states]) + context['message'] = _('Will be removed from all documents.') + elif len(states) > 1: + context['title'] = _(u'Are you sure you wish to delete the states: %s?') % ', '.join([unicode(d) for d in states]) + context['message'] = _('Will be removed from all documents.') + + return render_to_response('generic_confirm.html', context, + context_instance=RequestContext(request))