0001-fields-fix-live-prefill-for-items-with-carddef-datas.patch

Lauréline Guérin, 07 juillet 2022 10:36

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

Subject: [PATCH] fields: fix live prefill for items with carddef datasource
 (#59052)

 tests/form_pages/test_live.py                 | 83 +++++++++++++++++++
 wcs/fields.py                                 |  7 ++
 wcs/forms/common.py                           |  4 +
 wcs/qommon/static/js/qommon.forms.js          |  8 +-
 .../qommon/forms/widgets/checkboxes.html      |  1 +
 5 files changed, 102 insertions(+), 1 deletion(-)

         assert urlopen.call_args[0][0] == 'http://remote.example.net/json?plop=&q=deux'
     def test_field_live_items_datasource_carddef_prefill(pub, http_requests):
         CardDef.wipe()
         carddef_related = CardDef()
         carddef_related.name = 'bar'
         carddef_related.digest_templates = {'default': '{{ form_var_bar }}'}
         carddef_related.fields = [
             fields.StringField(id='1', type='string', label='string', varname='bar'),
+        ]
         carddef_related.store()
         carddef_related.data_class().wipe()
         for value in ['A', 'B', 'C']:
             carddata = carddef_related.data_class()()
             carddata.data = {
                 '1': value,
+            }
             carddata.just_created()
             carddata.store()
         carddef = CardDef()
         carddef.name = 'foo'
         carddef.digest_templates = {'default': '{{ form_var_foo }}'}
         carddef.fields = [
             fields.StringField(id='1', type='string', label='string', varname='foo'),
             fields.ItemsField(
                 type='items',
                 id='2',
                 varname='items',
                 data_source={'type': 'carddef:bar'},
             ),
+        ]
         carddef.store()
         carddef.data_class().wipe()
         carddata1 = carddef.data_class()()
         carddata1.data = {
             '1': 'bar',
             '2': ['1'],
             '2_display': ['A'],
+        }
         carddata1.just_created()
         carddata1.store()
         carddata2 = carddef.data_class()()
         carddata2.data = {
             '1': 'baz',
             '2': ['2', '3'],
             '2_display': 'B,C',
+        }
         carddata2.just_created()
         carddata2.store()
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'Foo'
         formdef.fields = [
             fields.ItemField(
                 type='item', id='1', label='foo', varname='foo', data_source={'type': 'carddef:foo'}
             ),
             fields.ItemsField(
                 type='items',
                 id='2',
                 label='items',
                 varname='items',
                 prefill={'type': 'string', 'value': '{{ form_var_foo_live_var_items }}'},
                 data_source={'type': 'carddef:bar'},
             ),
+        ]
         formdef.store()
         formdef.data_class().wipe()
         app = get_app(pub)
         resp = app.get('/foo/')
         assert resp.html.find('div', {'data-field-id': '1'}).attrs['data-live-source'] == 'true'
         assert resp.pyquery('#var_items.widget-prefilled')  # second field is marked as prefilled
         resp.form['f1'] = str(carddata2.id)
         live_resp = app.post('/foo/live?modified_field_id=1&prefilled_2=on', params=resp.form.submit_fields())
         assert live_resp.json['result']['2'] == {'visible': True, 'content': ['2', '3']}
         resp.form['f2$element1'] = True  # manually changed -> widget-prefilled class will be removed
         resp.form['f1'] = str(carddata1.id)
         live_resp = app.post('/foo/live?modified_field_id=1', params=resp.form.submit_fields())
         assert live_resp.json['result']['2'] == {'visible': True}
     def test_field_live_block_string_prefill(pub, http_requests):
         FormDef.wipe()
         BlockDef.wipe()

             else:
                 return []
         def get_ids_by_option_text(self, text_values):
             if self.data_source:
                 ids = [data_sources.get_id_by_option_text(self.data_source, v) for v in text_values]
                 ids = [i for i in ids if i]
                 return ids
             return text_values
         def perform_more_widget_changes(self, form, kwargs, edit=True):
             kwargs['options'] = self.get_options()
             kwargs['min_choices'] = self.min_choices

                             id_value = field.get_id_by_option_text(value)
                             if id_value:
                                 value = id_value
                         elif field.key == 'items' and value:
                             id_values = field.get_ids_by_option_text([v.strip() for v in value.split(',')])
                             if id_values:
                                 value = id_values
                         entry['content'] = value
                 elif field.prefill and field.prefill.get('type') == 'user':
                     update_prefill = bool(get_request().form.get('modified_field_id') == 'user')

                         // replace checkbox input value
                         $widget.find('input[type=checkbox]').prop('checked', value.content);
+                      }
                       if ($widget.hasClass('CheckboxesWidget') && Array.isArray(value.content)) {
                         $($widget).find('input[type=checkbox]').prop('checked', false);
                         $.each(value.content, function() {
                           $($widget).find('input[type=checkbox][data-value="' + this + '"]').prop('checked', true);
                         });
+                      }
                       // replace select value
                       $(widget).find('select').val(value.content);
                       $(widget).find('select').val(value.content).trigger('change.select2');
                       // replace radio value
                       $(widget).find('input[type=radio]').prop('checked', false);
                       $(widget).find('input[type=radio][value="'+value.content+'"]').prop('checked', true);

        {% if option.selected %}checked="checked"
        {% elif widget.readonly or option.disabled %}disabled{% endif %}
        {% for attr in widget.attrs.items %}{{attr.0}}="{{attr.1}}" {% endfor %}
        data-value="{{ option.value }}"
        type="checkbox"
        {% if widget.readonly %}value="yes" disabled {% else %}name="{{ option.name }}" value="yes"{% endif %}
        ><span>{{ option.label }}</span></label>
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-fields-fix-live-prefill-for-items-with-carddef-datas.patch