0001-workflows-add-support-for-django-template-as-anchor-.patch

Frédéric Péters, 02 mai 2020 22:36

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

Subject: [PATCH] workflows: add support for django template as anchor date
 (#33862)

 tests/test_workflow_import.py |  2 ++
 tests/test_workflows.py       | 32 ++++++++++++++++++++++++++++++++
 wcs/workflows.py              | 18 +++++++++++++++---
 3 files changed, 49 insertions(+), 3 deletions(-)

         ac1 = wf.add_global_action('Action', 'ac1')
         trigger = ac1.append_trigger('timeout')
         trigger.anchor_expression = 'False'
         trigger.anchor_template = '{{x}}'
         trigger.anchor = 'python'
         wf2 = assert_import_export_works(wf, include_id=True)
         assert wf2.global_actions[0].triggers[-1].id == trigger.id
         assert wf2.global_actions[0].triggers[-1].anchor == trigger.anchor
         assert wf2.global_actions[0].triggers[-1].anchor_expression == trigger.anchor_expression
         assert wf2.global_actions[0].triggers[-1].anchor_template == trigger.anchor_template
     def test_global_webservice_trigger(pub):

         assert formdef.data_class().get(formdata1.id).get_criticality_level_object().name == 'green'
         formdata1.store()
         # django template
         trigger.anchor = 'template'
         trigger.anchor_template = '{{ form_receipt_date|date:"Y-m-d" }}'
         workflow.store()
         pub.apply_global_action_timeouts()
         assert formdef.data_class().get(formdata1.id).get_criticality_level_object().name == 'yellow'
         formdata1.store()
         # django template
         trigger.anchor = 'template'
         trigger.anchor_template = '{{ form_receipt_date|date:"Y-m-d" }}'
         workflow.store()
         pub.apply_global_action_timeouts()
         assert formdef.data_class().get(formdata1.id).get_criticality_level_object().name == 'yellow'
         formdata1.store()
         # django template (with local date format)
         trigger.anchor = 'template'
         trigger.anchor_template = '{{ form_receipt_date }}'
         workflow.store()
         pub.apply_global_action_timeouts()
         assert formdef.data_class().get(formdata1.id).get_criticality_level_object().name == 'yellow'
         formdata1.store()
         # django template (with local date/time format)
         trigger.anchor = 'template'
         trigger.anchor_template = '{{ form_receipt_datetime }}'
         workflow.store()
         pub.apply_global_action_timeouts()
         assert formdef.data_class().get(formdata1.id).get_criticality_level_object().name == 'yellow'
         formdata1.store()
     def test_global_timeouts_latest_arrival(two_pubs):
         pub = two_pubs

         key = 'timeout'
         anchor = None
         anchor_expression = ''
         anchor_template = ''
         anchor_status_first = None
         anchor_status_latest = None
         timeout = None
         def get_parameters(self):
             return ('anchor', 'anchor_expression', 'anchor_status_first',
             return ('anchor', 'anchor_expression', 'anchor_template', 'anchor_status_first',
                     'anchor_status_latest', 'timeout')
         def get_anchor_labels(self):
-...
                     ('1st-arrival', _('First arrival in status')),
                     ('latest-arrival', _('Latest arrival in status')),
                     ('finalized', _('Arrival in final status')),
                     ('template', _('String / Template')),
                     ('python', _('Python expression')),
             ])
-...
                      options=options, value=self.anchor, required=True,
                      attrs={'data-dynamic-display-parent': 'true'})
             form.add(StringWidget, 'anchor_expression', title=_('Expression'), size=80,
             form.add(StringWidget, 'anchor_expression', title=_('Python Expression to get reference date'), size=80,
                      value=self.anchor_expression,
                      hint=_('This will only apply to open forms.'),
                      hint=_('This should produce a date; it will only apply to open forms.'),
                      attrs={'data-dynamic-display-child-of': 'anchor',
                             'data-dynamic-display-value': _('Python expression')})
             form.add(StringWidget, 'anchor_template', title=_('String / Template with reference date'), size=80,
                      value=self.anchor_template,
                      hint=_('This should be a date; it will only apply to open forms.'),
                      attrs={'data-dynamic-display-child-of': 'anchor',
                             'data-dynamic-display-value': _('String / Template')})
             possible_status = [(None, _('Current Status'), None)]
             possible_status.extend([('wf-%s' % x.id, x.name, x.id) for x in workflow.possible_status])
             form.add(SingleSelectWidget, 'anchor_status_first', title=_('Status'),
-...
                             anchor_date = evolution.time
                         else:
                             break
             elif self.anchor == 'template':
                 variables = get_publisher().substitutions.get_context_variables()
                 anchor_date = Template(self.anchor_template, autoescape=False).render(variables)
             elif self.anchor == 'python':
                 variables = get_publisher().substitutions.get_context_variables()
                 try:
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-workflows-add-support-for-django-template-as-anchor-.patch