0001-fields-add-check-for-value-given-as-block-field-6343.patch

Frédéric Péters, 15 août 2022 20:37

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

Subject: [PATCH] fields: add check for value given as block field (#63437)

 tests/workflow/test_all.py  | 46 +++++++++++++++++++++++++++++++++++++
 wcs/fields.py               |  2 ++
 wcs/wf/backoffice_fields.py |  4 ++--
 3 files changed, 50 insertions(+), 2 deletions(-)

         assert formdata.data['bo1_display'] == 'XNoneY'
     def test_set_backoffice_field_invalid_block_value(pub):
         BlockDef.wipe()
         Workflow.wipe()
         FormDef.wipe()
         block = BlockDef()
         block.name = 'foobar'
         block.fields = [StringField(id='123', required=True, label='Test', type='string', varname='foo')]
         block.store()
         wf = Workflow(name='xxx')
         wf.backoffice_fields_formdef = WorkflowBackofficeFieldsFormDef(wf)
         st1 = wf.add_status('Status1')
         wf.backoffice_fields_formdef.fields = [
             BlockField(id='bo1', label='1st backoffice field', max_items=3, type='block:foobar'),
+        ]
         wf.store()
         formdef = FormDef()
         formdef.name = 'baz'
         formdef.fields = []
         formdef.workflow_id = wf.id
         formdef.store()
         formdata = formdef.data_class()()
         formdata.just_created()
         formdata.store()
         get_publisher().substitutions.feed(formdata)
         item = SetBackofficeFieldsWorkflowStatusItem()
         item.parent = st1
         item.fields = [{'field_id': 'bo1', 'value': 'xxx'}]
         pub.loggederror_class.wipe()
         item.perform(formdata)
         assert pub.loggederror_class.count() == 1
         logged_error = pub.loggederror_class.select()[0]
         assert (
             logged_error.summary
             == 'Failed to set Field Block (foobar) field (bo1), error: invalid value for block'
+        )
         formdata = formdef.data_class().get(formdata.id)
         assert not formdata.data.get('bo1')
     def test_set_backoffice_field_immediate_use(http_requests, pub):
         Workflow.wipe()
         FormDef.wipe()

                 value = None
             if isinstance(value, BlockRowValue):
                 value = value.make_value(block=self.block, field=self, data=data)
             elif value and not (isinstance(value, dict) and 'data' in value and 'schema' in value):
                 raise SetValueError('invalid value for block')
             super().set_value(data, value, **kwargs)
         def get_json_value(self, value, **kwargs):

                     except ValueError as e:
                         summary = _('Failed to convert %(class)s value to %(kind)s field (%(id)s)') % {
                             'class': type(new_value),
                             'kind': getattr(formdef_field, 'description', _('unknown')),
                             'kind': formdef_field.get_type_label(),
                             'id': field['field_id'],
+                        }
                         expression_dict = self.get_expression(field['value'])
-...
                     formdef_field.set_value(formdata.data, new_value)
                 except SetValueError as e:
                     summary = _('Failed to set %(kind)s field (%(id)s), error: %(exc)s') % {
                         'kind': getattr(formdef_field, 'description', _('unknown')),
                         'kind': formdef_field.get_type_label(),
                         'id': field['field_id'],
                         'exc': e,
+                    }
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-fields-add-check-for-value-given-as-block-field-6343.patch