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

misc: always display spaces between {{ }} and variable names (#54801)

This commit is contained in:
Frédéric Péters 2021-06-15 08:51:53 +02:00
parent b3c171bfeb
commit a8c4f9e021
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/admin_pages/test_form.py
View File

@ -2155,13 +2155,13 @@ def test_form_limit_display_to_page(pub):
app = login(get_app(pub))
resp = app.get('/backoffice/forms/1/fields/')
assert '{{form_var_foobar}}' in resp.text
assert '{{ form_var_foobar }}' in resp.text
assert '2nd page' in resp.text
resp = resp.click('Limit display to this page', index=0)
hidden_fields = ''.join(re.findall('display:none.*', resp.text))
assert 'Display all pages' in resp.text
assert '{{form_var_foobar}}' not in hidden_fields
assert '{{form_var_baz}}' in hidden_fields
assert '{{ form_var_foobar }}' not in hidden_fields
assert '{{ form_var_baz }}' in hidden_fields
def test_form_fields_reorder(pub):

2
wcs/admin/fields.py
View File

@ -330,7 +330,7 @@ class FieldsDirectory(Directory):
if getattr(field, 'varname', None) and CompatibilityNamesDict.valid_key_regex.match(
field.varname
):
r += htmltext(' - <span class="varname">{{%s%s}}</span>') % (
r += htmltext(' - <span class="varname">{{ %s%s }}</span>') % (
self.field_var_prefix,
field.varname,
)

2
wcs/wf/export_to_model.py
View File

@ -327,7 +327,7 @@ class ExportToModel(WorkflowStatusItem):
varnames = get_varnames(formdef.fields)
for pair in varnames:
hint += (
htmltext('<li><tt class="varname">{{%s}}</tt>' ' <label>%s</label></span></li>')
htmltext('<li><tt class="varname">{{ %s }}</tt>' ' <label>%s</label></span></li>')
% pair
)
hint += htmltext('</ul>')