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

revert "fields: display page with single comment in summary (#56640)" 

This reverts commit 8bef36e105 as it will
also display all title/subtitle/comment fields from conditional pages
the user didn't visit.
This commit is contained in:
Frédéric Péters 2021-10-13 15:53:05 +02:00
parent 7665bf1fc7
commit 69640091e8
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/form_pages/test_all.py
View File

@ -1453,7 +1453,7 @@ def test_form_summary_empty_pages(pub):
type='page',
condition={'type': 'python', 'value': 'form_var_toto == "foo"'},
),
fields.TitleField(id='6', label='title in second page', type='title', display_locations=[]),
fields.TitleField(id='6', label='title in second page', type='title'),
fields.StringField(id='3', label='string'),
fields.PageField(id='4', label='3rd page', type='page'),
fields.StringField(id='5', label='string'),
@ -1509,23 +1509,6 @@ def test_form_summary_empty_pages(pub):
assert '<h3>3rd page</h3>' in resp.text
assert '<h3>4th page</h3>' not in resp.text
formdef.fields[8].display_locations = ['summary']
formdef.store()
resp = app.get('/test/') # -> 1st page
resp.form['f1'] = 'foo'
resp = resp.form.submit('submit') # -> 2nd page
resp.form['f3'] = 'bar'
resp = resp.form.submit('submit') # -> 3rd page
resp.form['f5'] = 'baz'
resp = resp.form.submit('submit') # -> 4th page
resp = resp.form.submit('submit') # -> validation
resp = resp.form.submit('submit')
resp = resp.follow() # -> submit
assert '<h3>1st page</h3>' in resp.text
assert '<h3>2nd page</h3>' in resp.text
assert '<h3>3rd page</h3>' in resp.text
assert '<h3>4th page</h3>' in resp.text
def test_form_display_locations(pub):
formdef = create_formdef()

5
wcs/formdata.py
View File

@ -1342,10 +1342,7 @@ class FormData(StorableObject):
# ignore empty pages
fields_and_details = []
for page in pages:
if not any(
bool(x['field'].type in ('title', 'subtitle', 'comment') or 'value' in x)
for x in page['fields']
):
if not any(bool('value' in x) for x in page['fields']):
continue
fields_and_details.append(page)
fields_and_details.extend([x for x in page['fields']])