0001-misc-allow-dynamic-view-filters-to-be-based-on-email.patch

Frédéric Péters, 21 juin 2022 17:49

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

Subject: [PATCH] misc: allow dynamic view filters to be based on email fields
 (#64533)

 tests/form_pages/test_live.py | 25 +++++++++++++++++++------
 wcs/backoffice/management.py  |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

         assert not resp.form['f2'].attrs.get('value')
     def test_dynamic_item_field_from_custom_view_on_cards(pub):
     @pytest.mark.parametrize('field_type', ['item', 'string', 'email'])
     def test_dynamic_item_field_from_custom_view_on_cards(pub, field_type):
         if not pub.is_using_postgresql():
             pytest.skip('this requires SQL')
             return
-...
         carddef.digest_templates = {'default': '{{form_var_attr}}'}
         carddef.workflow_roles = {'_editor': user.roles[0]}
         carddef.fields = [
             fields.ItemField(id='0', type='item', label='item', varname='item', items=['foo', 'bar', 'baz']),
             fields.StringField(id='1', type='string', label='string', varname='attr'),
+        ]
         if field_type == 'item':
             carddef.fields.append(
                 fields.ItemField(id='0', type='item', label='item', varname='item', items=['foo', 'bar', 'baz'])
+            )
         elif field_type == 'string':
             carddef.fields.append(fields.StringField(id='0', type='string', label='string', varname='item'))
         elif field_type == 'email':
             carddef.fields.append(fields.EmailField(id='0', type='email', label='email', varname='item'))
         carddef.store()
         carddef.data_class().wipe()
         baz_ids = set()
-...
             carddata = carddef.data_class()()
             carddata.data = {
                 '0': value,
                 '0_display': value,
                 '1': 'attr%s' % i,
+            }
             if field_type == 'item':
                 carddata.data['0_display'] = value
             carddata.just_created()
             carddata.store()
             if value == 'baz':
-...
         resp.forms['save-custom-view']['visibility'] = 'datasource'
         resp = resp.forms['save-custom-view'].submit().follow()
         assert resp.forms['listing-settings']['filter-0-value'].attrs['data-allow-template']
         assert 'custom value' in [x[2] for x in resp.forms['listing-settings']['filter-0-value'].options]
         resp.forms['listing-settings']['filter-0-value'].force_value('{{ form_var_blah }}')
         if field_type == 'item':
             # some javascript to get a text input for filter value
             assert resp.forms['listing-settings']['filter-0-value'].attrs['data-allow-template']
             assert 'custom value' in [x[2] for x in resp.forms['listing-settings']['filter-0-value'].options]
             resp.forms['listing-settings']['filter-0-value'].force_value('{{ form_var_blah }}')
         else:
             resp.forms['listing-settings']['filter-0-value'] = '{{ form_var_blah }}'
         resp = resp.forms['listing-settings'].submit()
         assert resp.forms['listing-settings']['filter-0-value'].value == '{{ form_var_blah }}'

                         filter_field_value = False
                     else:
                         raise RequestError('Invalid value "%s" for "%s"' % (filter_field_value, filter_field_key))
                 elif filter_field.type in ('item', 'items', 'string'):
                 elif filter_field.type in ('item', 'items', 'string', 'email'):
                     if Template.is_template_string(filter_field_value):
                         if keep_templates:
                             criterias.append(criteria(filter_field.id, filter_field_value))
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-allow-dynamic-view-filters-to-be-based-on-email.patch