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

backoffice: use {{ }} when displaying varnames (#20670)

This commit is contained in:
Frédéric Péters 2017-12-14 08:02:55 +01:00
parent ec145dbfc5
commit c45b8364bb
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_admin_pages.py
View File

@ -1245,13 +1245,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.body
assert '{{form_var_foobar}}' in resp.body
assert '2nd page' in resp.body
resp = resp.click('Limit display to this page', index=0)
hidden_fields = ''.join(re.findall('display:none.*', resp.body))
assert 'Display all pages' in resp.body
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_legacy_int_id(pub):
create_superuser(pub)

2
wcs/admin/fields.py
View File

@ -266,7 +266,7 @@ class FieldsDirectory(Directory):
required = ' - ' + _('optional')
r += htmltext('<span class="optional">%s</span>') % required
if getattr(field, 'varname', None):
r += htmltext(' - <span class="varname">[%s%s]</span>') % (
r += htmltext(' - <span class="varname">{{%s%s}}</span>') % (
self.field_var_prefix, field.varname)
r += htmltext('</p>')
r += htmltext('<p class="commands">')

4
wcs/admin/workflows.py
View File

@ -1422,7 +1422,7 @@ class WorkflowPage(Directory):
r += htmltext('<li><a href="variables/fields/%s/">%s') % (
field.id, field.label)
if not '*' in field.varname:
r += htmltext(' <code class="varname">[form_option_%s]</code>') % field.varname
r += htmltext(' <code class="varname">{{form_option_%s}}</code>') % field.varname
r += htmltext('</a></li>')
r += htmltext('</ul>')
r += htmltext('</div>')
@ -1485,7 +1485,7 @@ class WorkflowPage(Directory):
r += htmltext('<li><a href="backoffice-fields/fields/%s/">%s') % (
field.id, field.label)
if field.varname:
r += htmltext(' <code class="varname">[form_var_%s]</code>') % field.varname
r += htmltext(' <code class="varname">{{form_var_%s}}</code>') % field.varname
r += htmltext('</a></li>')
r += htmltext('</ul>')
r += htmltext('</div>')

3
wcs/qommon/static/css/dc2/admin.css
View File

@ -51,13 +51,14 @@ ul.biglist li .details,
li.biglistitem .details {
margin: 0;
color: #555;
font-size: 80%;
font-size: 90%;
display: inline;
padding: 0 1ex;
}
ul.biglist li .details .varname {
font-family: monospace;
font-size: 90%;
}
ul.biglist li p.commands,

2
wcs/qommon/substitution.py
View File

@ -73,7 +73,7 @@ class Substitutions(object):
vars.sort()
for category, variable, comment in vars:
r += htmltext('<tr><td>%s</td><td>%s</td><td>%s</td>' % (
category, '[%s]' % variable, comment))
category, '{{ %s }}' % variable, comment))
r += htmltext('</tbody>')
r += htmltext('</table>')
return r.getvalue()

2
wcs/wf/export_to_model.py
View File

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