0001-backoffice-get-items-filter-options-from-existing-ca.patch

Frédéric Péters, 25 mai 2022 21:50

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

Subject: [PATCH] backoffice: get items filter options from existing cards
 (#48881)

 tests/backoffice_pages/test_filters.py | 98 ++++++++++++++++++++++++++
 wcs/backoffice/management.py           |  8 +--
 wcs/fields.py                          | 48 +++++++++----
 3 files changed, 135 insertions(+), 19 deletions(-)

     from wcs import fields
     from wcs.blocks import BlockDef
     from wcs.carddef import CardDef
     from wcs.data_sources import NamedDataSource
     from wcs.formdef import FormDef
     from wcs.qommon.http_request import HTTPRequest
-...
             assert resp.text.count('data-link') == 0  # no rows
     def test_backoffice_items_cards_filter(pub):
         pub.user_class.wipe()
         create_superuser(pub)
         pub.role_class.wipe()
         role = pub.role_class(name='test')
         role.store()
         CardDef.wipe()
         carddef = CardDef()
         carddef.name = 'foo'
         carddef.fields = [
             fields.StringField(id='1', label='Test', type='string', varname='foo'),
+        ]
         carddef.digest_templates = {'default': 'card {{ form_var_foo }}'}
         carddef.store()
         card_ids = {}
         for label in ('foo', 'bar', 'baz', 'foo, bar'):
             card = carddef.data_class()()
             card.data = {'1': label}
             card.just_created()
             card.store()
             card_ids[label] = str(card.id)
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'form-title'
         formdef.fields = [
             fields.ItemsField(
                 id='1',
                 label='items',
                 type='items',
                 data_source={'type': 'carddef:foo', 'value': ''},
+            )
+        ]
         formdef.workflow_roles = {'_receiver': role.id}
         formdef.store()
         data_class = formdef.data_class()
         data_class.wipe()
         formdata = data_class()
         formdata.data = {'1': [card_ids['foo']]}
         formdata.data['1_display'] = formdef.fields[0].store_display_value(formdata.data, '1')
         formdata.data['1_structured'] = formdef.fields[0].store_structured_value(formdata.data, '1')
         formdata.just_created()
         formdata.jump_status('new')
         formdata.store()
         formdata = data_class()
         formdata.data = {'1': [card_ids['foo'], card_ids['baz']]}
         formdata.data['1_display'] = formdef.fields[0].store_display_value(formdata.data, '1')
         formdata.data['1_structured'] = formdef.fields[0].store_structured_value(formdata.data, '1')
         formdata.just_created()
         formdata.jump_status('new')
         formdata.store()
         formdata = data_class()
         formdata.data = {'1': [card_ids['foo, bar']]}
         formdata.data['1_display'] = formdef.fields[0].store_display_value(formdata.data, '1')
         formdata.data['1_structured'] = formdef.fields[0].store_structured_value(formdata.data, '1')
         formdata.just_created()
         formdata.jump_status('new')
         formdata.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/management/%s/' % formdef.url_name)
         assert resp.pyquery('tbody tr').length == 3
         resp.forms['listing-settings']['filter-1'].checked = True
         resp = resp.forms['listing-settings'].submit()
         if pub.is_using_postgresql():
             # option 'bar' is never used so not even listed
             assert [x[2] for x in resp.forms['listing-settings']['filter-1-value'].options] == [
                 '',
                 'card baz',
                 'card foo',
                 'card foo, bar',
+            ]
         else:
             assert [x[2] for x in resp.forms['listing-settings']['filter-1-value'].options] == [
                 '',
                 'card bar',
                 'card baz',
                 'card foo',
                 'card foo, bar',
+            ]
         resp.forms['listing-settings']['filter-1-value'].value = card_ids['foo']
         resp = resp.forms['listing-settings'].submit()
         assert resp.pyquery('tbody tr').length == 2
         resp.forms['listing-settings']['filter-1-value'].value = card_ids['baz']
         resp = resp.forms['listing-settings'].submit()
         assert resp.pyquery('tbody tr').length == 1
     def test_backoffice_string_filter(pub):
         pub.user_class.wipe()
         create_superuser(pub)

+                )
             if filter_field.type == 'items':
                 # unnest key/values
                 exploded_options = {}
                 for option_keys, option_label in options:
                     if option_keys and option_label:
                         for option_key, option_label in zip(option_keys, option_label.split(', ')):
                             exploded_options[option_key] = option_label
                 options = list(sorted(exploded_options.items(), key=lambda x: x[1]))
                 options = list(sorted(filter_field.get_exploded_options(options), key=lambda x: x[1]))
             options = [(force_str(x), force_str(y)) for x, y in options if x and y]

+    )
     from .qommon.ods import NS as OD_NS
     from .qommon.ods import clean_text as od_clean_text
     from .qommon.storage import Contains
     from .qommon.template import Template, TemplateError
     from .qommon.upload_storage import PicklableUpload
     from .sessions import BasicSession
-...
         def get_data_source_parameter_view_label(self):
             return str(_('Data source'))
         def get_carddef(self):
             from wcs.carddef import CardDef
             if (
                 not self.data_source
                 or not self.data_source.get('type')
                 or not self.data_source['type'].startswith('carddef:')
             ):
                 return None
             carddef_slug = self.data_source['type'].split(':')[1]
             try:
                 return CardDef.get_by_urlname(carddef_slug)
             except KeyError:
                 return None
     class ItemField(WidgetField, MapOptionsMixin, ItemFieldMixin):
         key = 'item'
-...
             return self.display_mode
         def get_carddef(self):
             from wcs.carddef import CardDef
             if not self.data_source['type'].startswith('carddef:'):
                 return None
             carddef_slug = self.data_source['type'].split(':')[1]
             try:
                 return CardDef.get_by_urlname(carddef_slug)
             except KeyError:
                 return None
         def perform_more_widget_changes(self, form, kwargs, edit=True):
             data_source = data_sources.get_object(self.data_source)
             display_mode = self.get_display_mode(data_source)
-...
                 return value
             return []
         def get_exploded_options(self, options):
             carddef = self.get_carddef()
             if not carddef:
                 # unnest key/values
                 exploded_options = {}
                 for option_keys, option_label in options:
                     if option_keys and option_label:
                         for option_key, option_label in zip(option_keys, option_label.split(', ')):
                             exploded_options[option_key] = option_label
                 return exploded_options.items()
             options_ids = set()
             for option in options:
                 options_ids.update(set(option[0]))
             cards = carddef.data_class().select([Contains('id', options_ids)])
             return [(str(x.id), x.get_display_label()) for x in cards]
     register_field_class(ItemsField)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-backoffice-get-items-filter-options-from-existing-ca.patch