0001-admin-detail-target-status-on-choice-action-39207.patch

Nicolas Roche, 29 novembre 2020 19:34

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

Subject: [PATCH] admin: detail target status on choice action (#39207)

 tests/admin_pages/test_workflow.py | 60 +++++++++++++++++++++++++++++-
 wcs/workflows.py                   | 23 +++++++-----
 2 files changed, 72 insertions(+), 11 deletions(-)

     import pytest
     from webtest import Upload
     from wcs.qommon.http_request import HTTPRequest
     from wcs.roles import Role
     from wcs.workflows import (
         Workflow, WorkflowCriticalityLevel, DisplayMessageWorkflowStatusItem,
         WorkflowBackofficeFieldsFormDef, CommentableWorkflowStatusItem)
         WorkflowBackofficeFieldsFormDef, CommentableWorkflowStatusItem,
         ChoiceWorkflowStatusItem)
     from wcs.wf.dispatch import DispatchWorkflowStatusItem
     from wcs.wf.export_to_model import ExportToModel
     from wcs.wf.jump import JumpWorkflowStatusItem
     from wcs.wf.register_comment import RegisterCommenterWorkflowStatusItem
     from wcs.wf.wscall import WebserviceCallStatusItem
     from wcs.carddef import CardDef
     from wcs.formdef import FormDef
     from wcs import fields
-...
         resp = app.get('/backoffice/workflows/1/')
         resp = resp.click('baz')
         resp = resp.click(href='items/1/', index=0)
         assert 'foobar' not in [x[2] for x in resp.form['by$element0'].options]
         assert '_receiver' in [x[0] for x in resp.form['by$element0'].options]
     def test_workflows_edit_choice_action_line_details(pub):
         create_superuser(pub)
         create_role()
         Workflow.wipe()
         wf = Workflow(name='foo')
         st1 = wf.add_status('New')
         st2 = wf.add_status('Resubmit')
         jump = ChoiceWorkflowStatusItem()
         jump.id = '1'
         jump.parent = st1
         st1.items.append(jump)
         wf.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/workflows/%s/status/%s/' % (wf.id, st1.id))
         assert resp.html.find('a', {'href': 'items/1/'}).text == 'Manual Jump (not completed)'
         jump.label = 'Resubmit'
         wf.store()
         resp = app.get('/backoffice/workflows/%s/status/%s/' % (wf.id, st1.id))
         assert resp.html.find('a', {'href': 'items/1/'}).text == \
             'Manual Jump (not completed)'
         jump.status = st2.id
         wf.store()
         resp = app.get('/backoffice/workflows/%s/status/%s/' % (wf.id, st1.id))
         assert resp.html.find('a', {'href': 'items/1/'}).text == \
             'Manual Jump ("Resubmit", to Resubmit)'
         jump.label = 'Resubmit'
         wf.store()
         resp = app.get('/backoffice/workflows/%s/status/%s/' % (wf.id, st1.id))
         assert resp.html.find('a', {'href': 'items/1/'}).text == \
             'Manual Jump ("Resubmit", to Resubmit)'
         jump.set_marker_on_status = True
         wf.store()
         resp = app.get('/backoffice/workflows/%s/status/%s/' % (wf.id, st1.id))
         assert resp.html.find('a', {'href': 'items/1/'}).text == \
             'Manual Jump ("Resubmit", to Resubmit (and set marker))'
         jump.set_marker_on_status = False
         jump.by = ['_submitter']
         wf.store()
         resp = app.get('/backoffice/workflows/%s/status/%s/' % (wf.id, st1.id))
         assert resp.html.find('a', {'href': 'items/1/'}).text == \
             'Manual Jump ("Resubmit", to Resubmit, by User)'
         jump.set_marker_on_status = True
         wf.store()
         resp = app.get('/backoffice/workflows/%s/status/%s/' % (wf.id, st1.id))
         assert resp.html.find('a', {'href': 'items/1/'}).text == \
             'Manual Jump ("Resubmit", to Resubmit, by User (and set marker))'
     def test_workflows_action_subpath(pub):
         create_superuser(pub)
         create_role()
         Workflow.wipe()
         workflow = Workflow(name='foo')
         baz_status = workflow.add_status(name='baz')
         display_message = DisplayMessageWorkflowStatusItem()
         display_message.parent = baz_status

         def get_label(self):
             expression = self.get_expression(self.label)
             if expression['type'] == 'text':
                 return expression['value']
             return _('computed label')
         def get_line_details(self):
             if self.label:
             if self.label and self.status:
                 to_status = self.parent.parent.get_status(self.status)
                 more = ''
                 if self.set_marker_on_status:
                     more += ' ' + _('(and set marker)')
                 if self.by:
                     return  _('"%(label)s" by %(by)s%(more)s') % {
                             'label' : self.get_label(),
                             'by' : self.render_list_of_roles(self.by),
                             'more': more
+                        }
                     return _('"%(label)s", to %(to)s, by %(by)s%(more)s') % {
                         'label': self.get_label(),
                         'to': to_status.name,
                         'by': self.render_list_of_roles(self.by),
                         'more': more
+                    }
                 else:
                     return _('"%(label)s"%(more)s') % {
                             'label': self.get_label(),
                             'more': more
+                        }
                     return _('"%(label)s", to %(to)s%(more)s') % {
                         'label': self.get_label(),
                         'to': to_status.name,
                         'more': more
+                    }
             else:
                 return _('not completed')
         def fill_form(self, form, formdata, user, **kwargs):
             label = self.compute(self.label)
             if not label:
                 return
             widget = form.add_submit('button%s' % self.id, label)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-admin-detail-target-status-on-choice-action-39207.patch