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

trivial: reapply black

This commit is contained in:
Frédéric Péters 2021-02-15 17:56:27 +01:00
parent 86c70cb2a9
commit a11be8fa59
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/form_pages/test_block.py
View File

@ -579,8 +579,12 @@ def test_block_multi_string_prefill(pub):
block.name = 'foobar'
block.fields = [
fields.StringField(
id='123', required=True, label='Test', type='string',
prefill={'type': 'string', 'value': '{{ form_var_foo }} World'}),
id='123',
required=True,
label='Test',
type='string',
prefill={'type': 'string', 'value': '{{ form_var_foo }} World'},
),
]
block.store()
@ -626,8 +630,12 @@ def test_block_multi_string_modify_prefill(pub):
block.name = 'foobar'
block.fields = [
fields.StringField(
id='123', required=True, label='Test', type='string',
prefill={'type': 'string', 'value': '{{ form_var_foo }} World'}),
id='123',
required=True,
label='Test',
type='string',
prefill={'type': 'string', 'value': '{{ form_var_foo }} World'},
),
]
block.store()
@ -644,7 +652,6 @@ def test_block_multi_string_modify_prefill(pub):
app = get_app(pub)
formdef.data_class().wipe()
resp = app.get(formdef.get_url())
resp.form['f1'] = 'Hello'

23
wcs/forms/root.py
View File

@ -328,6 +328,7 @@ class FormPage(Directory, FormTemplateMixin):
@classmethod
def iter_with_block_fields(cls, form, fields):
from wcs.blocks import BlockSubWidget
for field in fields:
field_key = '%s' % field.id
widget = form.get_widget('f%s' % field_key) if form else None
@ -335,8 +336,8 @@ class FormPage(Directory, FormTemplateMixin):
if field.key == 'block':
# we prefill all items
for idx, subwidget in enumerate(
[x for x in widget.widgets if isinstance(x, BlockSubWidget)]
if widget else []):
[x for x in widget.widgets if isinstance(x, BlockSubWidget)] if widget else []
):
if not isinstance(subwidget, BlockSubWidget):
continue
for subfield in field.block.fields:
@ -524,9 +525,9 @@ class FormPage(Directory, FormTemplateMixin):
req = get_request()
req.environ['REQUEST_METHOD'] = 'GET'
had_prefill = self.apply_field_prefills(data, form,
displayed_fields,
add_button_clicked=bool(submit_button is True))
had_prefill = self.apply_field_prefills(
data, form, displayed_fields, add_button_clicked=bool(submit_button is True)
)
if had_prefill:
# include prefilled data
@ -541,7 +542,9 @@ class FormPage(Directory, FormTemplateMixin):
else:
# not a page change, reset_locked_data() will have been called
# earlier, we use that to set appropriate fields as readonly.
for field, field_key, widget, block, block_idx in self.iter_with_block_fields(form, displayed_fields):
for field, field_key, widget, block, block_idx in self.iter_with_block_fields(
form, displayed_fields
):
if get_request().form.get('__locked_f%s' % field_key):
widget.readonly = 'readonly'
widget.attrs['readonly'] = 'readonly'
@ -558,7 +561,9 @@ class FormPage(Directory, FormTemplateMixin):
# pass over prefilled fields that are used as live source of item
# fields
fields_to_update = set()
for field, field_key, widget, block, block_idx in self.iter_with_block_fields(form, displayed_fields):
for field, field_key, widget, block, block_idx in self.iter_with_block_fields(
form, displayed_fields
):
if getattr(widget, 'prefilled', False) and getattr(widget, 'live_condition_source', False):
fields_to_update.update(widget.live_condition_fields)
elif field in fields_to_update and field.type == 'item':
@ -1142,7 +1147,9 @@ class FormPage(Directory, FormTemplateMixin):
prefill_user = get_request().user
if get_request().is_in_backoffice():
prefill_user = get_publisher().substitutions.get_context_variables().get('form_user')
for field, field_key, widget, block, block_idx in self.iter_with_block_fields(form, self.formdef.fields):
for field, field_key, widget, block, block_idx in self.iter_with_block_fields(
form, self.formdef.fields
):
if not field.prefill:
continue
post_key = 'f%s' % field_key