0001-backoffice-use-when-displaying-varnames-20670.patch
| tests/test_admin_pages.py | ||
|---|---|---|
| 1245 | 1245 | |
| 1246 | 1246 |
app = login(get_app(pub)) |
| 1247 | 1247 |
resp = app.get('/backoffice/forms/1/fields/')
|
| 1248 |
assert '[form_var_foobar]' in resp.body
|
|
| 1248 |
assert '{{form_var_foobar}}' in resp.body
|
|
| 1249 | 1249 |
assert '2nd page' in resp.body |
| 1250 | 1250 |
resp = resp.click('Limit display to this page', index=0)
|
| 1251 | 1251 |
hidden_fields = ''.join(re.findall('display:none.*', resp.body))
|
| 1252 | 1252 |
assert 'Display all pages' in resp.body |
| 1253 |
assert '[form_var_foobar]' not in hidden_fields
|
|
| 1254 |
assert '[form_var_baz]' in hidden_fields
|
|
| 1253 |
assert '{{form_var_foobar}}' not in hidden_fields
|
|
| 1254 |
assert '{{form_var_baz}}' in hidden_fields
|
|
| 1255 | 1255 | |
| 1256 | 1256 |
def test_form_legacy_int_id(pub): |
| 1257 | 1257 |
create_superuser(pub) |
| wcs/admin/fields.py | ||
|---|---|---|
| 267 | 267 |
required = ' - ' + _('optional')
|
| 268 | 268 |
r += htmltext('<span class="optional">%s</span>') % required
|
| 269 | 269 |
if getattr(field, 'varname', None): |
| 270 |
r += htmltext(' - <span class="varname">[%s%s]</span>') % (
|
|
| 270 |
r += htmltext(' - <span class="varname">{{%s%s}}</span>') % (
|
|
| 271 | 271 |
self.field_var_prefix, field.varname) |
| 272 | 272 |
r += htmltext('</p>')
|
| 273 | 273 |
r += htmltext('<p class="commands">')
|
| wcs/admin/workflows.py | ||
|---|---|---|
| 1427 | 1427 |
r += htmltext('<li><a href="variables/fields/%s/">%s') % (
|
| 1428 | 1428 |
field.id, field.label) |
| 1429 | 1429 |
if not '*' in field.varname: |
| 1430 |
r += htmltext(' <code class="varname">[form_option_%s]</code>') % field.varname
|
|
| 1430 |
r += htmltext(' <code class="varname">{{form_option_%s}}</code>') % field.varname
|
|
| 1431 | 1431 |
r += htmltext('</a></li>')
|
| 1432 | 1432 |
r += htmltext('</ul>')
|
| 1433 | 1433 |
r += htmltext('</div>')
|
| ... | ... | |
| 1490 | 1490 |
r += htmltext('<li><a href="backoffice-fields/fields/%s/">%s') % (
|
| 1491 | 1491 |
field.id, field.label) |
| 1492 | 1492 |
if field.varname: |
| 1493 |
r += htmltext(' <code class="varname">[form_var_%s]</code>') % field.varname
|
|
| 1493 |
r += htmltext(' <code class="varname">{{form_var_%s}}</code>') % field.varname
|
|
| 1494 | 1494 |
r += htmltext('</a></li>')
|
| 1495 | 1495 |
r += htmltext('</ul>')
|
| 1496 | 1496 |
r += htmltext('</div>')
|
| wcs/qommon/static/css/dc2/admin.css | ||
|---|---|---|
| 51 | 51 |
li.biglistitem .details {
|
| 52 | 52 |
margin: 0; |
| 53 | 53 |
color: #555; |
| 54 |
font-size: 80%;
|
|
| 54 |
font-size: 90%;
|
|
| 55 | 55 |
display: inline; |
| 56 | 56 |
padding: 0 1ex; |
| 57 | 57 |
} |
| 58 | 58 | |
| 59 | 59 |
ul.biglist li .details .varname {
|
| 60 | 60 |
font-family: monospace; |
| 61 |
font-size: 90%; |
|
| 61 | 62 |
} |
| 62 | 63 | |
| 63 | 64 |
ul.biglist li p.commands, |
| wcs/qommon/substitution.py | ||
|---|---|---|
| 73 | 73 |
vars.sort() |
| 74 | 74 |
for category, variable, comment in vars: |
| 75 | 75 |
r += htmltext('<tr><td>%s</td><td>%s</td><td>%s</td>' % (
|
| 76 |
category, '[%s]' % variable, comment))
|
|
| 76 |
category, '{{ %s }}' % variable, comment))
|
|
| 77 | 77 |
r += htmltext('</tbody>')
|
| 78 | 78 |
r += htmltext('</table>')
|
| 79 | 79 |
return r.getvalue() |
| wcs/wf/export_to_model.py | ||
|---|---|---|
| 297 | 297 |
% _('Available variables')
|
| 298 | 298 |
varnames = get_varnames(formdef.fields) |
| 299 | 299 |
for pair in varnames: |
| 300 |
hint += htmltext('<li><tt class="varname">[%s]</tt>'
|
|
| 300 |
hint += htmltext('<li><tt class="varname">{{%s}}</tt>'
|
|
| 301 | 301 |
' <label>%s</label></span></li>') % pair |
| 302 | 302 |
hint += htmltext('</ul>')
|
| 303 | 303 |
ids = (formdef.id,) + ids |
| 304 |
- |
|