entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 45 Releases Activity

misc: make _live_ attributes work with custom view data sources (#47844)

This commit is contained in:
Frédéric Péters 2020-10-19 14:31:44 +02:00
parent bcbaabf181
commit 700265f03e
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_formdata.py
View File

@ -828,9 +828,22 @@ def test_lazy_formdata_live_item(pub):
assert context['form_var_foo_live_var_attr'] == 'attr2'
assert 'form_var_foo_live_var_attr' in context.get_flat_keys()
# check it also works with custom views
ds = {'type': 'carddef:%s:xxx' % carddef.url_name}
formdef.fields = [fields.ItemField(id='0', label='string', type='item',
varname='foo', data_source=ds, display_disabled_items=True)]
formdef.store()
pub.substitutions.reset()
pub.substitutions.feed(pub)
pub.substitutions.feed(formdef)
pub.substitutions.feed(formdata)
pub.get_request().live_card_cache = {}
assert 'form_var_foo_live_var_attr' in context.get_flat_keys()
assert context['form_var_foo_live_var_name'] == 'baz'
# mock missing carddef to get call count
pub.get_request().live_card_cache = {}
context = pub.substitutions.get_context_variables(mode='lazy')
# mock missing carddef to get call count
with mock.patch('wcs.carddef.CardDef.get_by_urlname') as get_by_urlname:
get_by_urlname.side_effect = KeyError

2
wcs/variables.py
View File

@ -712,7 +712,7 @@ class LazyFieldVarStructured(LazyFieldVar):
return LazyFormData(carddata)
from wcs.carddef import CardDef
try:
carddef = CardDef.get_by_urlname(self._field.data_source['type'][8:])
carddef = CardDef.get_by_urlname(self._field.data_source['type'].split(':')[1])
carddata = carddef.data_class().get(self.raw)
if request:
request.live_card_cache[cache_key] = carddata