0001-fields-add-check-on-value-receive-to-prefill-items-f.patch

Frédéric Péters, 05 juillet 2022 13:33

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

Subject: [PATCH] fields: add check on value receive to prefill items fields
 (#66995)

 tests/form_pages/test_all.py | 76 ++++++++++++++++++++++++++----------
 wcs/fields.py                |  9 ++++-
 2 files changed, 64 insertions(+), 21 deletions(-)

     def test_form_page_template_prefill_items_field(pub):
         BlockDef.wipe()
         create_user(pub)
         block = BlockDef()
         block.name = 'foobar'
         block.fields = [
             fields.StringField(id='123', required=True, label='Test', type='string', varname='test'),
+        ]
         block.store()
         formdef = create_formdef()
         formdef.data_class().wipe()
         formdef.fields = [
-...
                 label='items',
                 items=['foo', 'bar', 'baz'],
                 prefill={'type': 'string', 'value': 'foo,baz'},
+            )
             ),
             fields.FileField(id='1', label='file', type='file', varname='file'),
             fields.BlockField(id='2', label='test', type='block:foobar', varname='foobar'),
+        ]
         formdef.store()
-...
         resp.form['f0$element1'].checked = True
         resp.form['f0$element2'].checked = False
         assert 'widget-prefilled' in resp.text
         resp.form['f1$file'] = Upload('test.txt', b'foobar', 'text/plain')
         resp.form['f2$element0$f123'] = 'plop'
         resp = resp.form.submit('submit')
         resp = resp.form.submit('submit')
         assert formdef.data_class().count() == 1
         # check with remote json
         ds = {'type': 'json', 'value': 'http://remote.example.net/json'}
         formdef.fields = [
             fields.ItemsField(
                 id='0',
                 label='items',
                 data_source=ds,
                 display_disabled_items=True,
                 prefill={'type': 'string', 'value': 'foo,baz'},
+            )
+        ]
         formdef.fields[0] = fields.ItemsField(
             id='0',
             label='items',
             data_source=ds,
             display_disabled_items=True,
             prefill={'type': 'string', 'value': 'foo,baz'},
+        )
         formdef.store()
         with mock.patch('wcs.qommon.misc.urlopen') as urlopen:
-...
             assert resp.form['f0$elementbaz'].checked
             # check with template returning a complex data
             formdef.fields = [
                 fields.ItemsField(
                     id='0',
                     varname='items',
                     label='items',
                     data_source=ds,
                     display_disabled_items=True,
                     prefill={'type': 'string', 'value': '{{form_objects|first|get:"form_var_items_raw"}}'},
+                )
+            ]
             formdef.fields[0] = fields.ItemsField(
                 id='0',
                 varname='items',
                 label='items',
                 data_source=ds,
                 display_disabled_items=True,
                 prefill={'type': 'string', 'value': '{{form_objects|first|get:"form_var_items_raw"}}'},
+            )
             formdef.store()
             # it will use foo,bar as selected in the first part of this test
-...
             assert resp.form['f0$elementbar'].checked
             assert not resp.form['f0$elementbaz'].checked
             # check with complex data of wrong type
             for invalid_prefill_value in [
                 {'type': 'string', 'value': '{{form_objects|first|get:"form_var_file_raw"}}'},
                 {'type': 'string', 'value': '{{form_objects|first|get:"form_var_foobar"}}'},
                 {'type': 'formula', 'value': '[{"a": "foo", "b": "baz"}]'},
             ]:
                 formdef.fields[0] = fields.ItemsField(
                     id='0',
                     varname='items',
                     label='items',
                     data_source=ds,
                     display_disabled_items=True,
                     prefill=invalid_prefill_value,
+                )
                 formdef.store()
                 resp = get_app(pub).get('/test/')
                 assert not resp.form['f0$elementfoo'].checked
                 assert not resp.form['f0$elementbar'].checked
                 assert not resp.form['f0$elementbaz'].checked
                 if pub.is_using_postgresql():
                     assert pub.loggederror_class.count() == 1
                     logged_error = pub.loggederror_class.select()[0]
                     assert logged_error.summary == 'Invalid value for items prefill on field "items"'
                     pub.loggederror_class.wipe()
     def test_form_page_changing_prefill(pub):
         formdef = create_formdef()

             self.check_items_admin_form(form)
         def get_prefill_value(self, user=None, force_string=True):
             return super().get_prefill_value(user=user, force_string=False)
             value, explicit_lock = super().get_prefill_value(user=user, force_string=False)
             if not isinstance(value, (str, tuple, list)) or not all(isinstance(x, (int, str)) for x in value):
                 get_publisher().record_error(
                     _('Invalid value for items prefill on field "%s"') % self.label,
                     formdef=getattr(self, 'formdef', None),
+                )
                 return (None, explicit_lock)
             return (value, explicit_lock)
         def convert_value_to_str(self, value):
             return value
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-fields-add-check-on-value-receive-to-prefill-items-f.patch