0001-fields-do-not-consider-prefill-of-type-none-as-a-rea.patch

Frédéric Péters, 23 mai 2022 09:25

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

Subject: [PATCH] fields: do not consider prefill of type none as a real
 prefill (#65544)

 tests/admin_pages/test_form.py |  4 +--
 tests/form_pages/test_block.py | 57 ++++++++++++++++++++++++++++++++++
 wcs/fields.py                  |  5 +--
 wcs/forms/root.py              |  3 ++
 4 files changed, 65 insertions(+), 4 deletions(-)

         app = login(get_app(pub))
         resp = app.get('/backoffice/forms/1/fields/1/')
         assert resp.forms[0]['prefill$type'].options == [
             ('None', False, 'None'),
             ('None', True, 'None'),
             ('String / Template', False, 'String / Template'),
             ('Python Expression', False, 'Python Expression'),
             ('User Field', False, 'User Field'),
-...
         resp = app.get('/backoffice/forms/1/fields/1/')
         assert resp.forms[0]['prefill$type'].options == [
             ('None', False, 'None'),
             ('None', True, 'None'),
             ('String / Template', False, 'String / Template'),
             ('User Field', False, 'User Field'),
             ('Geolocation', False, 'Geolocation'),

             '1_display': 'foobar, foobar',
+        }
         formdef.data_class().wipe()
     def test_block_with_block_item_field_condition_and_prefill(pub):
         BlockDef.wipe()
         block = BlockDef()
         block.name = 'foobar'
         block.fields = [
             fields.StringField(
                 id='123',
                 required=True,
                 label='One',
                 type='string',
                 prefill={'type': 'string', 'value': '{{ "plop" }}'},
             ),
             fields.ItemField(
                 id='234',
                 required=True,
                 label='Test2',
                 type='item',
                 varname='item',
                 items=['Foo', 'Bar'],
                 prefill={'type': 'none'},
             ),
             fields.StringField(
                 id='345',
                 required=True,
                 label='Two',
                 type='string',
                 condition={'type': 'django', 'value': 'block_var_item == "Foo"'},
             ),
+        ]
         block.store()
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'form title'
         formdef.fields = [
             fields.BlockField(id='1', label='test', type='block:foobar'),
+        ]
         formdef.store()
         formdef.data_class().wipe()
         app = get_app(pub)
         resp = app.get(formdef.get_url())
         assert resp.form['f1$element0$f123'].value == 'plop'
         assert resp.form['f1$element0$f234'].value == 'Foo'
         assert resp.pyquery('[data-widget-name="f1$element0$f234"]').attr['data-live-source'] == 'true'
         assert resp.pyquery('[data-widget-name="f1$element0$f345"]').attr.style == 'display: none'
         live_resp = app.post(
             formdef.get_url() + 'live?modified_field_id=123&modified_block_id=1&modified_block_row=0',
             params=resp.form.submit_fields(),
+        )
         assert live_resp.json['result']['1-123-0']['visible'] is True
         assert live_resp.json['result']['1-234-0']['visible'] is True
         assert live_resp.json['result']['1-345-0']['visible'] is True
         resp.form['f1$element0$f345'] = 'test'
         resp = resp.form.submit('submit')  # validation

                 SingleSelectWidget,
                 'type',
                 options=options,
                 value=value.get('type'),
                 value=value.get('type') or 'none',
                 attrs={'data-dynamic-display-parent': 'true'},
+            )
-...
         def _parse(self, request):
             values = {}
             type_ = self.get('type')
             if type_:
             if type_ and type_ != 'none':
                 values['type'] = type_
                 values['locked'] = self.get('locked')
                 value = self.get('value_%s' % type_)
-...
                     widget.extra_css_class = '%s %s' % (widget.extra_css_class, self.extra_css_class)
                 else:
                     widget.extra_css_class = self.extra_css_class
             return widget
         def store_display_value(self, data, field_id, raise_on_error=False):
             value = data.get(field_id)

                 prefilled = False
                 locked = False
                 if field.prefill and field.prefill.get('type') == 'none':
                     field.prefill = {}
                 if field.prefill:
                     prefill_user = get_request().user
                     if get_request().is_in_backoffice():
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-fields-do-not-consider-prefill-of-type-none-as-a-rea.patch