0001-cards-ignore-custom-view-criterias-when-looking-up-o.patch

Frédéric Péters, 20 avril 2022 15:01

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

Subject: [PATCH] cards: ignore custom view criterias when looking up on id
 (#52653)

 tests/test_carddef.py | 52 +++++++++++++++++++++++++++++++++++++++++++
 wcs/carddef.py        |  2 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

             {'varname': 'foo_block_foo_1', 'type': 'item', 'obj': 'formdef:formdef-1'},
             {'varname': 'bar', 'type': 'items', 'obj': 'formdef:formdef-2'},
+        ]
     def test_data_source_custom_view_data_access(pub):
         CardDef.wipe()
         carddef = CardDef()
         carddef.name = 'foo'
         carddef.fields = [
             StringField(id='1', label='Test', type='string', varname='foo'),
             StringField(id='2', label='Test2', type='string', varname='foo2'),
+        ]
         carddef.digest_templates = {'default': '{{ form_var_foo }}'}
         carddef.store()
         carddef.data_class().wipe()
         pub.custom_view_class.wipe()
         custom_view = pub.custom_view_class()
         custom_view.title = 'view'
         custom_view.formdef = carddef
         custom_view.columns = {'list': [{'id': 'id'}]}
         custom_view.filters = {'filter-1': 'on', 'filter-1-value': 'xxx'}
         custom_view.visibility = 'datasource'
         custom_view.store()
         carddata = carddef.data_class()()
         carddata.data = {'1': 'hello world'}
         carddata.just_created()
         carddata.store()
         # no filter, there's a card
         cards = CardDef.get_data_source_items('carddef:foo')
         assert len(cards) == 1
         cards = CardDef.get_data_source_items('carddef:foo', get_by_text='hello world')
         assert len(cards) == 1
         # nothing returned as the filter doesn't match anything
         cards = CardDef.get_data_source_items('carddef:foo:view')
         assert len(cards) == 0
         # filter is ignored for id lookup
         cards = CardDef.get_data_source_items('carddef:foo:view', get_by_id=carddata.id)
         assert len(cards) == 1
         assert cards[0]['text'] == 'hello world'
         cards = CardDef.get_data_source_items('carddef:foo:view', get_by_id=carddata.get_display_id())
         assert len(cards) == 1
         assert cards[0]['text'] == 'hello world'
         # filter is not ignored for text lookup
         cards = CardDef.get_data_source_items('carddef:foo:view', get_by_text='hello world')
         assert len(cards) == 0

             criterias = [StrictNotEqual('status', 'draft'), Null('anonymised')]
             order_by = None
             digest_key = 'default'
             if len(parts) > 2:
             if len(parts) > 2 and not get_by_id:
                 if custom_view is None:
                     custom_view = cls.get_data_source_custom_view(data_source_id, carddef=carddef)
                     if not custom_view:
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-cards-ignore-custom-view-criterias-when-looking-up-o.patch