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

misc: make summary view respect block label display mode (#51890)

This commit is contained in:
Frédéric Péters 2021-03-11 21:47:17 +01:00
parent 025dd54212
commit 4e8b9bcd56
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/form_pages/test_block.py
View File

@ -774,11 +774,19 @@ def test_block_label(pub, blocks_feature):
formdef.store()
resp = app.get(formdef.get_url())
assert resp.pyquery.find('h4').text() == 'Block Label*'
resp.form['f1$element0$f123'] = 'something'
resp = resp.form.submit('submit') # -> validation page
assert 'Check values then click submit.' in resp.text
assert resp.pyquery.find('h4').text() == 'Block Label'
formdef.fields[0].label_display = 'hidden'
formdef.store()
resp = app.get(formdef.get_url())
assert 'Block Label' not in resp.text
resp.form['f1$element0$f123'] = 'something'
resp = resp.form.submit('submit') # -> validation page
assert 'Check values then click submit.' in resp.text
assert 'Block Label' not in resp.text
def test_block_multipage(pub, blocks_feature):

8
wcs/forms/common.py
View File

@ -505,10 +505,14 @@ class FormStatusPage(Directory, FormTemplateMixin):
if f.extra_css_class:
css_classes.append(f.extra_css_class)
r += htmltext('<div class="%s">' % ' '.join(css_classes))
r += htmltext('<span class="label">%s</span> ') % f.label
if f.key == 'block' and f.label_display == 'subtitle':
r += htmltext('<div class="subtitle"><h4>%s</h4></div>') % f.label
elif not (f.key == 'block' and f.label_display == 'hidden'):
r += htmltext('<span class="label">%s</span> ') % f.label
value, value_details = field_value_info['value'], field_value_info['value_details']
if value is None:
r += htmltext('<div class="value"><i>%s</i></div>') % _('Not set')
if not (f.key == 'block' and f.label_display == 'hidden'):
r += htmltext('<div class="value"><i>%s</i></div>') % _('Not set')
else:
r += htmltext('<div class="value">')
s = f.get_view_value(value, summary=True, **value_details)