0001-workflows-add-possibility-to-mark-and-jump-to-marked.patch

Frédéric Péters, 01 juin 2017 13:47

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

Subject: [PATCH] workflows: add possibility to mark and jump to marked status
 (#16524)

This keeps a stack of marked status and allow to pop back to previous
ones.

 tests/test_admin_pages.py           |  32 +++++++++++
 tests/test_backoffice_pages.py      | 110 ++++++++++++++++++++++++++++++++++++
 wcs/admin/workflows.py              |   3 +-
 wcs/backoffice/management.py        |  11 +++-
 wcs/formdata.py                     |  27 +++++++--
 wcs/qommon/static/css/dc2/admin.css |   4 ++
 wcs/wf/jump.py                      |   4 +-
 wcs/workflows.py                    |  52 ++++++++++++++---
 8 files changed, 228 insertions(+), 15 deletions(-)

         resp = resp.click('Edit')
         assert not 'in_listing' in resp.form.fields.keys()
     def test_workflows_edit_choice_action(pub):
         create_superuser(pub)
         role = create_role()
         Workflow.wipe()
         workflow = Workflow(name='foo')
         workflow.add_status(name='baz')
         workflow.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         resp.forms[0]['type'] = 'Change Status'
         resp = resp.forms[0].submit()
         resp = resp.follow()
         resp = resp.click(href='items/1/', index=0)
         assert 'Previously Marked Status' not in [x[2] for x in resp.form['status'].options]
         resp.form['status'].value = 'baz'
         resp = resp.form.submit('submit')
         resp = resp.follow()
         resp = resp.follow()
         resp = resp.click(href='items/1/', index=0)
         resp.form['set_marker_on_status'].value = True
         resp = resp.form.submit('submit')
         resp = resp.follow()
         resp = resp.follow()
         resp = resp.click(href='items/1/', index=0)
         assert 'Previously Marked Status' in [x[2] for x in resp.form['status'].options]
     def test_workflows_action_subpath(pub):
         create_superuser(pub)
         role = create_role()

     import StringIO
     import time
     import hashlib
     import random
     import pytest
     from webtest import Upload
-...
                 .parents('li').children('div.value span')
                 .text() == '\'\\xed\\xa0\\x00\'')
     def test_workflow_jump_previous(pub):
         user = create_user(pub)
         create_environment(pub)
         wf = Workflow(name='jump around')
         #       North
         #     /      \
         # West <----> East
         #   |          |
         #   |         autojump
         #    |         |
         #     \       /
         #       South
         st1 = wf.add_status('North')
         st1.id = 'north'
         st2 = wf.add_status('West')
         st2.id = 'west'
         st3 = wf.add_status('East')
         st3.id = 'east'
         st4 = wf.add_status('Autojump')
         st4.id = 'autojump'
         st5 = wf.add_status('South')
         st5.id = 'south'
         button_by_id = {}
         def add_jump(label, src, dst_id):
             jump = ChoiceWorkflowStatusItem()
             jump.id = str(random.random())
             jump.label = label
             jump.by = ['logged-users']
             jump.status = dst_id
             src.items.append(jump)
             jump.parent = src
             if dst_id != '_previous':
                 jump.set_marker_on_status = True
             button_by_id[label] = 'button%s' % jump.id
             return jump
         add_jump('Go West', st1, st2.id)
         add_jump('Go East', st1, st3.id)
         add_jump('Go South', st2, st5.id)
         add_jump('Go Autojump', st3, st4.id)
         add_jump('Go Back', st5, '_previous')
         add_jump('Jump West', st3, st2.id)
         add_jump('Jump East', st2, st3.id)
         jump = JumpWorkflowStatusItem()
         jump.id = '_auto-jump'
         jump.status = st5.id
         st4.items.append(jump)
         jump.parent = st4
         wf.store()
         formdef = FormDef.get_by_urlname('form-title')
         formdef.data_class().wipe()
         formdef.workflow = wf
         formdef.store()
         formdata = formdef.data_class()()
         formdata.data = {}
         formdata.just_created()
         formdata.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/management/form-title/%s/' % formdata.id)
         # jump around using buttons
         resp = resp.form.submit(button_by_id['Go West']).follow()  # push (north)
         assert formdef.data_class().get(formdata.id).status == 'wf-%s' % st2.id
         resp = resp.form.submit(button_by_id['Go South']).follow() # push (north, west)
         assert formdef.data_class().get(formdata.id).status == 'wf-%s' % st5.id
         resp = resp.form.submit(button_by_id['Go Back']).follow()  # pop (north)
         assert formdef.data_class().get(formdata.id).status == 'wf-%s' % st2.id
         resp = resp.form.submit(button_by_id['Go South']).follow() # push (north, west)
         assert formdef.data_class().get(formdata.id).status == 'wf-%s' % st5.id
         resp = resp.form.submit(button_by_id['Go Back']).follow()  # pop (north)
         assert formdef.data_class().get(formdata.id).status == 'wf-%s' % st2.id
         resp = resp.form.submit(button_by_id['Jump East']).follow() # push (north, west)
         assert formdef.data_class().get(formdata.id).status == 'wf-%s' % st3.id
         resp = resp.form.submit(button_by_id['Go Autojump']).follow() # push (north, west, east)
         assert formdef.data_class().get(formdata.id).status == 'wf-%s' % st5.id
         # check markers are displayed in /inspect page
         user.is_admin = True
         user.store()
         resp2 = app.get('/backoffice/management/form-title/%s/inspect' % formdata.id)
         assert 'Markers Stack' in resp2.body
         assert '<span class="status">East</span>' in resp2.body
         assert '<span class="status">West</span>' in resp2.body
         assert '<span class="status">North</span>' in resp2.body
         assert resp2.body.find('<span class="status">East</span>') < resp2.body.find('<span class="status">West</span>')
         assert resp2.body.find('<span class="status">West</span>') < resp2.body.find('<span class="status">North</span>')
         resp = resp.form.submit(button_by_id['Go Back']).follow() # pop (north, west)
         assert formdef.data_class().get(formdata.id).status == 'wf-%s' % st3.id
         # and do a last jump using the API
         formdata = formdef.data_class().get(formdata.id)
         formdata.jump_status('_previous') # pop (north)
         assert formdata.status == 'wf-%s' % st2.id
         formdata = formdef.data_class().get(formdata.id)
         formdata.jump_status('_previous') # pop ()
         assert formdata.status == 'wf-%s' % st1.id
     def test_backoffice_fields(pub):
         user = create_user(pub)
         create_environment(pub)

         for status in workflow.possible_status:
             i = status.id
             for item in status.items:
                 next_status_ids = [x.id for x in item.get_target_status() if x.id != status.id]
                 next_status_ids = [x.id for x in item.get_target_status()
                                    if x.id and x.id != status.id]
                 if not next_status_ids:
                     next_status_ids = [status.id]
                 done = {}

                 if not isinstance(v, basestring):
                     r += htmltext(' <span class="type">(%r)</span>') % type(v)
                 r += htmltext('</div></li>')
             if '_markers_stack' in (self.filled.workflow_data or {}):
                 r += htmltext('<li><h3>%s</h3></li>') % _('Markers Stack')
                 for marker in reversed(self.filled.workflow_data['_markers_stack']):
                     status = self.filled.get_status(marker['status_id'])
                     if status:
                         r += htmltext('<li><span class="status">%s</span></li>') % status.name
                     else:
                         r += htmltext('<li><span class="status">%s</span></li>') % _('Unknown')
             r += htmltext('</ul>')
             r += htmltext('</div>')
             return r.getvalue()

                 return None
             if not self.formdef:
                 return None
             if status.startswith('wf-'):
                 status = status[3:]
             try:
                 status_id = status.split('-')[1]
                 wf_status = [x for x in self.formdef.workflow.possible_status if x.id == status_id][0]
                 wf_status = [x for x in self.formdef.workflow.possible_status if x.id == status][0]
             except IndexError:
                 return None
             return wf_status
-...
                 return None
             return wf_status.handle_form(form, self, user)
         def get_previous_marked_status(self):
             if not self.workflow_data or not '_markers_stack' in self.workflow_data:
                 return None
             try:
                 marker_data = self.workflow_data['_markers_stack'].pop()
                 status_id = marker_data['status_id']
             except IndexError:
                 return None
             return self.formdef.workflow.get_status(status_id)
         def jump_status(self, status_id):
             if status_id == '_previous':
                 previous_status = self.get_previous_marked_status()
                 assert previous_status, 'failed to compute previous status'
                 status_id = previous_status.id
             evo = Evolution()
             evo.time = time.localtime()
             evo.status = 'wf-%s' % status_id
-...
             if self.workflow_data:
                 d.update(self.workflow_data)
                 # pass over uploaded files and attach an extra attribute with the
                 # url to the file.
                 # pass over workflow data to:
                 #  - attach an extra url attribute to uploaded files
                 #  - remove "private" attributes
                 for k, v in self.workflow_data.items():
                     if k[0] == '_':
                         del d[k]
                         continue
                     if isinstance(v, Upload):
                         try:
                             formvar, fieldvar = re.match('(.*)_var_(.*)_raw$', k).groups()

     	font-size: 100%;
+    }
     ul.form-inspector li span.status {
     	padding: 0 1ex;
+    }
     ul.form-inspector li div.value {
     	display: block;
     	padding: 0 0 0.5ex 1em;

                 return _('Change Status Automatically (to %s)') % wf_status[0].name
         def get_parameters(self):
             return ('status', 'condition', 'trigger', 'by', 'timeout')
             return ('status', 'set_marker_on_status', 'condition', 'trigger', 'by', 'timeout')
         def add_parameters_widgets(self, form, parameters, prefix='', formdef=None):
             WorkflowStatusJumpItem.add_parameters_widgets(self, form, parameters, prefix, formdef)
-...
                 return
             if self.must_jump(formdata):
                 wf_status = self.get_target_status()
                 wf_status = self.get_target_status(formdata)
                 if wf_status:
                     formdata.status = 'wf-%s' % wf_status[0].id

         def get_substitution_variables(self, formdata):
             return {}
         def get_target_status(self):
         def get_target_status(self, formdata=None):
             """Returns a list of status this item can lead to."""
             if not getattr(self, 'status', None):
                 return []
             if self.status == '_previous':
                 if formdata is None:
                     # must be in a formdata to compute destination, just give a
                     # fake status for presentation purpose
                     return [WorkflowStatus(_('Previously Marked Status'))]
                 previous_status = formdata.get_previous_marked_status()
                 if previous_status:
                     return [previous_status]
                 return []
             try:
                 return [x for x in self.parent.parent.possible_status if x.id == self.status]
             except IndexError:
-...
     class WorkflowStatusJumpItem(WorkflowStatusItem):
         status = None
         endpoint = False
         set_marker_on_status = False
         def add_parameters_widgets(self, form, parameters, prefix='', formdef=None):
             if 'status' in parameters:
                 destinations = [(x.id, x.name) for x in self.parent.parent.possible_status]
                 # look for existing jumps that are dropping a mark
                 has_markers = False
                 for status in self.parent.parent.possible_status:
                     for item in status.items:
                         if getattr(item, 'set_marker_on_status', False):
                             destinations.append(('_previous', _('Previously Marked Status')))
                             break
                     else:
                         continue
                     break
                 form.add(SingleSelectWidget, '%sstatus' % prefix, title = _('Status'), value = self.status,
                     options = [(None, '---')] + [(x.id, x.name) for x in self.parent.parent.possible_status])
                     options = [(None, '---')] + destinations)
             if 'set_marker_on_status' in parameters:
                 form.add(CheckboxWidget, '%sset_marker_on_status' % prefix,
                     title=_('Set marker on status'),
                     value=self.set_marker_on_status,
                     advanced=not(self.set_marker_on_status))
         def get_parameters(self):
             return ('status',)
             return ('status', 'set_marker_on_status')
     def get_role_translation(formdata, role_name):
-...
         def submit_form(self, form, formdata, user, evo):
             if form.get_submit() == 'button%s' % self.id:
                 wf_status = self.get_target_status()
                 wf_status = self.get_target_status(formdata)
                 if wf_status:
                     evo.status = 'wf-%s' % wf_status[0].id
                     if self.set_marker_on_status:
                         if formdata.workflow_data and '_markers_stack' in formdata.workflow_data:
                             markers_stack = formdata.workflow_data.get('_markers_stack')
                         else:
                             markers_stack = []
                         markers_stack.append({'status_id': formdata.status[3:]})
                         formdata.update_workflow_data({'_markers_stack': markers_stack})
                     form.clear_errors()
                     return True # get out of processing loop
-...
                          value=self.backoffice_info_text)
         def get_parameters(self):
             return ('by', 'status', 'label', 'backoffice_info_text', 'require_confirmation')
             return ('by', 'status', 'label', 'backoffice_info_text',
                     'require_confirmation', 'set_marker_on_status')
     register_item_class(ChoiceWorkflowStatusItem)
-...
         def submit_form(self, form, formdata, user, evo):
             if form.is_submitted() and not form.has_errors():
                 wf_status = self.get_target_status()
                 wf_status = self.get_target_status(formdata)
                 if wf_status:
                     evo.status = 'wf-%s' % wf_status[0].id
         def get_parameters(self):
             return ('status',)
             return ('status', 'set_marker_on_status')
     register_item_class(JumpOnSubmitWorkflowStatusItem)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-workflows-add-possibility-to-mark-and-jump-to-marked.patch