0001-workflows-sort-workflow-actions-in-categories-3405.patch

Frédéric Péters, 22 octobre 2017 10:45

Voir les différences: en ligne côte à côte

Subject: [PATCH] workflows: sort workflow actions in categories (#3405)

 tests/test_admin_pages.py            | 57 ++++++++++++++++++++----------------
 wcs/admin/workflows.py               | 43 +++++++++++++++------------
 wcs/qommon/static/css/dc2/admin.css  |  4 +++
 wcs/qommon/static/js/qommon.admin.js | 11 +++++++
 wcs/wf/aggregation_email.py          |  1 +
 wcs/wf/anonymise.py                  |  1 +
 wcs/wf/attachment.py                 |  1 +
 wcs/wf/backoffice_fields.py          |  1 +
 wcs/wf/criticality.py                |  1 +
 wcs/wf/dispatch.py                   |  1 +
 wcs/wf/export_to_model.py            |  1 +
 wcs/wf/form.py                       |  1 +
 wcs/wf/geolocate.py                  |  1 +
 wcs/wf/profile.py                    |  1 +
 wcs/wf/redirect_to_url.py            |  1 +
 wcs/wf/register_comment.py           |  1 +
 wcs/wf/remove.py                     |  1 +
 wcs/wf/resubmit.py                   |  1 +
 wcs/wf/roles.py                      |  2 ++
 wcs/wf/wscall.py                     |  1 +
 wcs/workflows.py                     |  6 ++++
 21 files changed, 93 insertions(+), 45 deletions(-)

         # create a new action
         resp = resp.click('new status')
         resp.forms[0]['type'] = 'Display message'
         resp.forms[0]['action-interaction'] = 'Display message'
         resp = resp.forms[0].submit()
         assert resp.location == 'http://example.net/backoffice/workflows/1/status/1/'
         resp = resp.follow()
-...
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         for action in [x[0] for x in resp.forms[0]['type'].options]:
             resp.forms[0]['type'] = action
             resp = resp.forms[0].submit()
             resp = resp.follow()
         for i in range(len(resp.forms[0]['type'].options)):
             resp = resp.click('Edit', href='items/%d/' % (i+1), index=0)
             resp = resp.forms[0].submit('cancel')
             resp = resp.follow() # redirect to items/
             resp = resp.follow() # redirect to ./
         for category in ('status-change', 'interaction', 'formdata-action', 'user-action'):
             for action in [x[0] for x in resp.forms[0]['action-%s' % category].options if x[0]]:
                 resp.forms[0]['action-%s' % category] = action
                 resp = resp.forms[0].submit()
                 resp = resp.follow()
         i = 1
         for category in ('status-change', 'interaction', 'formdata-action', 'user-action'):
             for action in [x[0] for x in resp.forms[0]['action-%s' % category].options if x[0]]:
                 resp = resp.click('Edit', href='items/%d/' % i, index=0)
                 resp = resp.forms[0].submit('cancel')
                 resp = resp.follow() # redirect to items/
                 resp = resp.follow() # redirect to ./
                 i += 1
     def test_workflows_check_available_actions(pub):
         create_superuser(pub)
-...
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         assert not 'Modify Criticality' in [x[0] for x in resp.forms[0]['type'].options]
         assert not 'Send SMS' in [x[0] for x in resp.forms[0]['type'].options]
         assert not 'Modify Criticality' in [x[0] for x in resp.forms[0]['action-formdata-action'].options]
         assert not 'Send SMS' in [x[0] for x in resp.forms[0]['action-interaction'].options]
         pub.cfg['sms'] = {'mode': 'foobar'}
         pub.write_cfg()
-...
         workflow.store()
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         assert 'Modify Criticality' in [x[0] for x in resp.forms[0]['type'].options]
         assert 'Send SMS' in [x[0] for x in resp.forms[0]['type'].options]
         assert 'Modify Criticality' in [x[0] for x in resp.forms[0]['action-formdata-action'].options]
         assert 'Send SMS' in [x[0] for x in resp.forms[0]['action-interaction'].options]
     def test_workflows_edit_dispatch_action(pub):
         create_superuser(pub)
-...
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         resp.forms[0]['type'] = 'Assign a Function'
         resp.forms[0]['action-formdata-action'] = 'Assign a Function'
         resp = resp.forms[0].submit()
         resp = resp.follow()
-...
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         resp.forms[0]['type'] = 'Send mail'
         resp.forms[0]['action-interaction'] = 'Send mail'
         resp = resp.forms[0].submit()
         resp = resp.follow()
-...
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         resp.form['type'] = 'Send SMS'
         resp.form['action-interaction'] = 'Send SMS'
         resp = resp.form.submit().follow()
         resp = resp.click('Send SMS')
-...
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         resp.forms[0]['type'] = 'Display a form'
         resp.forms[0]['action-interaction'] = 'Display a form'
         resp = resp.forms[0].submit()
         resp = resp.follow()
-...
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         resp.forms[0]['type'] = 'Change Status'
         resp.forms[0]['action-status-change'] = 'Change Status'
         resp = resp.forms[0].submit()
         resp = resp.follow()
-...
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         resp.forms[0]['type'] = 'Send mail'
         resp.forms[0]['action-interaction'] = 'Send mail'
         resp = resp.forms[0].submit()
         resp = resp.follow()
         assert 'Send mail' in resp.body
-...
         # check the "set backoffice fields" action is now available
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         resp.forms[0]['type'] = 'Set Backoffice Fields'
         resp.forms[0]['action-formdata-action'] = 'Set Backoffice Fields'
         resp = resp.forms[0].submit()
         resp = resp.follow()
-...
         resp = resp.follow()
         # test adding all actions
         for action in [x[0] for x in resp.forms[0]['type'].options]:
             resp.forms[0]['type'] = action
             resp = resp.forms[0].submit()
             resp = resp.follow()
         for category in ('status-change', 'interaction', 'formdata-action', 'user-action'):
             for action in [x[0] for x in resp.forms[0]['action-%s' % category].options if x[0]]:
                 resp.forms[0]['action-%s' % category] = action
                 resp = resp.forms[0].submit()
                 resp = resp.follow()
         # test visiting
         action_id = Workflow.get(workflow.id).global_actions[0].id

                 r += htmltext('<li><a href="delete" rel="popup">%s</a></li>') % _('Delete')
                 r += htmltext('</ul>')
                 r += htmltext('<div id="new-field">')
                 r += htmltext('<h3>%s</h3>') % _('New Item')
                 r += htmltext('<h3>%s</h3>') % _('New Action')
                 r += self.get_new_item_form().render()
                 r += htmltext('</div>')
             return r.getvalue()
-...
             return item.is_available(workflow=self.workflow)
         def get_new_item_form(self):
             form = Form(enctype='multipart/form-data', action = 'newitem')
             form = Form(enctype='multipart/form-data', action='newitem',
                     id='new-action-form')
             categories = [
                     ('status-change', _('Change Status')),
                     ('interaction', _('Interact')),
                     ('formdata-action', _('Act on Form')),
                     ('user-action', _('Act on User')),
+            ]
             available_items = [x for x in item_classes if self.is_item_available(x)]
             def cmp_items(x, y):
                 t = cmp(x.category and x.category[0], y.category and y.category[0])
                 if t:
                     return t
                 return cmp(_(x.description), _(y.description))
             available_items.sort(cmp_items)
             options = [(x.key, _(x.description)) for x in available_items]
             form.add(SingleSelectWidget, 'type', title = _('Type'),
                     required=True, options = options)
             available_items.sort(key=lambda x: _(x.description))
             for category, category_label in categories:
                 options = [(x.key, _(x.description)) for x in available_items
                            if x.category == category]
                 form.add(SingleSelectWidget, 'action-%s' % category, title=category_label,
                         required=False, options=[(None, '')] + options)
             form.add_submit('submit', _('Add'))
             return form
-...
                 get_session().message = ('error', _('Submitted form was not filled properly.'))
                 return redirect('.')
             if form.get_widget('type').parse():
                 self.status.append_item(form.get_widget('type').parse())
             else:
                 get_session().message = ('error', _('Submitted form was not filled properly.'))
                 return redirect('.')
             self.workflow.store()
             for category in ('status-change', 'interaction', 'formdata-action', 'user-action'):
                 action_type = form.get_widget('action-%s' % category).parse()
                 if action_type:
                     self.status.append_item(action_type)
                     self.workflow.store()
                     return redirect('.')
             get_session().message = ('error', _('Submitted form was not filled properly.'))
             return redirect('.')
         def delete(self):
             form = Form(enctype="multipart/form-data")
             form.widgets.append(HtmlWidget('<p>%s</p>' % _(

wcs/qommon/static/css/dc2/admin.css
1620	1620	div.widget input[type=text][readonly] {
1621	1621	background: #f0f0f0;
1622	1622	}
	1623
	1624	#new-action-form select[disabled] {
	1625	background: #f0f0f0;
	1626	}

           $('input[type=hidden][name=submission_channel]').val($(this).val());
         });
         /* new action form */
         $('#new-action-form select').on('change', function() {
           if ($(this).val() == '') {
             $('#new-action-form select').prop('disabled', null)
           } else {
             $('#new-action-form select').prop('disabled', 'disabled')
             $(this).prop('disabled', null)
+          }
           return false;
         });
         /* possibility to toggle the sidebar */
         if ($('#sidebar').length) {
           $('#main-content').after($('<span id="sidebar-toggle">&#8286;</span>'));

wcs/wf/aggregation_email.py
29	29	class AggregationEmailWorkflowStatusItem(WorkflowStatusItem):
30	30	description = N_('Aggregate to summary email')
31	31	key = 'aggregationemail'
	32	category = 'interaction'
32	33	ok_in_global_action = False
33	34
34	35	to = []

wcs/wf/anonymise.py
19	19	class AnonymiseWorkflowStatusItem(WorkflowStatusItem):
20	20	description = N_('Anonymise')
21	21	key = 'anonymise'
	22	category = 'formdata-action'
22	23
23	24	def perform(self, formdata):
24	25	formdata.anonymise()

wcs/wf/attachment.py
68	68	class AddAttachmentWorkflowStatusItem(WorkflowStatusItem):
69	69	description = N_('Allow Joining a File')
70	70	key = 'addattachment'
	71	category = 'interaction'
71	72	endpoint = False
72	73	waitpoint = True
73	74	ok_in_global_action = False

wcs/wf/backoffice_fields.py
67	67	class SetBackofficeFieldsWorkflowStatusItem(WorkflowStatusItem):
68	68	description = N_('Set Backoffice Fields')
69	69	key = 'set-backoffice-fields'
	70	category = 'formdata-action'
70	71
71	72	fields = None
72	73

wcs/wf/criticality.py
27	27	class ModifyCriticalityWorkflowStatusItem(WorkflowStatusItem):
28	28	description = N_('Modify Criticality')
29	29	key = 'modify_criticality'
	30	category = 'formdata-action'
30	31
31	32	mode = MODE_INC
32	33	absolute_value = None

wcs/wf/dispatch.py
80	80	class DispatchWorkflowStatusItem(WorkflowStatusItem):
81	81	description = N_('Assign a Function')
82	82	key = 'dispatch'
	83	category = 'formdata-action'
83	84
84	85	role_id = None
85	86	role_key = None

wcs/wf/export_to_model.py
196	196	class ExportToModel(WorkflowStatusItem):
197	197	description = N_('Create Document')
198	198	key = 'export_to_model'
	199	category = 'formdata-action'
199	200	support_substitution_variables = True
200	201	ok_in_global_action = False
201	202

wcs/wf/form.py
71	71	class FormWorkflowStatusItem(WorkflowStatusItem):
72	72	description = N_('Display a form')
73	73	key = 'form'
	74	category = 'interaction'
74	75	ok_in_global_action = False
75	76	endpoint = False
76	77	waitpoint = True

wcs/wf/geolocate.py
35	35	class GeolocateWorkflowStatusItem(WorkflowStatusItem):
36	36	description = N_('Geolocate')
37	37	key = 'geolocate'
	38	category = 'formdata-action'
38	39
39	40	method = 'address_string'
40	41	address_string = None

wcs/wf/profile.py
101	101	class UpdateUserProfileStatusItem(WorkflowStatusItem):
102	102	description = N_('Update User Profile')
103	103	key = 'update_user_profile'
	104	category = 'user-action'
104	105
105	106	fields = None
106	107

wcs/wf/redirect_to_url.py
22	22	class RedirectToUrlWorkflowStatusItem(WorkflowStatusItem):
23	23	description = N_('Redirect to URL')
24	24	key = 'redirect_to_url'
	25	category = 'formdata-action'
25	26	endpoint = False
26	27	support_substitution_variables = True
27	28

wcs/wf/register_comment.py
64	64	class RegisterCommenterWorkflowStatusItem(WorkflowStatusItem):
65	65	description = N_('Record in Log')
66	66	key = 'register-comment'
	67	category = 'interaction'
67	68
68	69	comment = None
69	70

wcs/wf/remove.py
21	21	class RemoveWorkflowStatusItem(WorkflowStatusItem):
22	22	description = N_('Remove')
23	23	key = 'remove'
	24	category = 'formdata-action'
24	25
25	26	def perform(self, formdata):
26	27	formdata.remove_self()

wcs/wf/resubmit.py
26	26	class ResubmitWorkflowStatusItem(WorkflowStatusItem):
27	27	description = N_('Resubmit')
28	28	key = 'resubmit'
	29	category = 'formdata-action'
29	30	endpoint = False
30	31	waitpoint = True
31	32	ok_in_global_action = False

     class AddRoleWorkflowStatusItem(WorkflowStatusItem):
         description = N_('Add Role to User')
         key = 'add_role'
         category = 'user-action'
         role_id = None
-...
     class RemoveRoleWorkflowStatusItem(WorkflowStatusItem):
         description = N_('Remove Role from User')
         key = 'remove_role'
         category = 'user-action'
         role_id = None

wcs/wf/wscall.py
94	94	class WebserviceCallStatusItem(WorkflowStatusItem):
95	95	description = N_('Webservice Call')
96	96	key = 'webservice_call'
	97	category = 'interaction'
97	98	support_substitution_variables = True
98	99
99	100	label = None

         status = None
         endpoint = False
         set_marker_on_status = False
         category = 'status-change'
         def add_parameters_widgets(self, form, parameters, prefix='', formdef=None):
             if 'status' in parameters:
-...
     class CommentableWorkflowStatusItem(WorkflowStatusItem):
         description = N_('Allow Comment')
         key = 'commentable'
         category = 'interaction'
         endpoint = False
         waitpoint = True
         ok_in_global_action = False
-...
     class SendmailWorkflowStatusItem(WorkflowStatusItem):
         description = N_('Send mail')
         key = 'sendmail'
         category = 'interaction'
         support_substitution_variables = True
         to = []
-...
     class SendSMSWorkflowStatusItem(WorkflowStatusItem):
         description = N_('Send SMS')
         key = 'sendsms'
         category = 'interaction'
         support_substitution_variables = True
         to = []
-...
     class DisplayMessageWorkflowStatusItem(WorkflowStatusItem):
         description = N_('Display message')
         key = 'displaymsg'
         category = 'interaction'
         support_substitution_variables = True
         ok_in_global_action = False
-...
     class EditableWorkflowStatusItem(WorkflowStatusItem):
         description = N_('Allow Edition')
         key = 'editable'
         category = 'formdata-action'
         endpoint = False
         waitpoint = True
         ok_in_global_action = False
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-workflows-sort-workflow-actions-in-categories-3405.patch