Skip to content

Commit 91bc611

Browse files
committed
Ensure aggregation function dropdowns expand to valid HTML
While browsers seem to accept slightly invalid HTML with two double quotes, the V4Pages.py test doesn't. This resolves a test failure inside V4Pages.py, which is only visible after upgrading various dependencies.
1 parent d2339d3 commit 91bc611

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

lnt/server/ui/templates/v4_graph.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ <h4>Controls</h4>
143143
<tr>
144144
<td>
145145
<select name="aggregation_function" id="aggregation_function">
146-
<option value="min" {{ 'selected="selected"' if options.aggregation_function == 'min' else '' }}>Minimum</option>
147-
<option value="max" {{ 'selected="selected"' if options.aggregation_function == 'max' else '' }}>Maximum</option>
148-
<option value="mean" {{ 'selected="selected"' if options.aggregation_function == 'mean' else '' }}>Mean</option>
149-
<option value="median" {{ 'selected="selected"' if options.aggregation_function == 'median' else '' }}>Median</option>
146+
<option value="min" {{ ('selected="selected"' if options.aggregation_function == 'min' else '') | safe }}>Minimum</option>
147+
<option value="max" {{ ('selected="selected"' if options.aggregation_function == 'max' else '') | safe }}>Maximum</option>
148+
<option value="mean" {{ ('selected="selected"' if options.aggregation_function == 'mean' else '') | safe }}>Mean</option>
149+
<option value="median" {{ ('selected="selected"' if options.aggregation_function == 'median' else '') | safe }}>Median</option>
150150
</select>
151151
</td>
152152
</tr>

lnt/server/ui/templates/v4_run.html

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
$('.profile-but-no-prev').tooltip();
3434
$('.profile-prev-only').tooltip();
3535
{% endblock %}
36-
36+
3737
{% block title %}Run Results{% endblock %}
3838

3939
{% macro get_cell_value(cr, field) %}
@@ -255,23 +255,20 @@ <h4>Parameters</h4>
255255
<td><label for="aggregation_function">Aggregation Function</label></td>
256256
<td>
257257
<select id="aggregation_function" name="aggregation_function">
258-
<option value="min" {{ 'selected="selected"' if options.aggregation_function == 'min' else '' }}>Minimum</option>
259-
<option value="max" {{ 'selected="selected"' if options.aggregation_function == 'max' else '' }}>Maximum</option>
260-
<option value="mean" {{ 'selected="selected"' if options.aggregation_function == 'mean' else '' }}>Mean</option>
261-
<option value="median" {{ 'selected="selected"' if options.aggregation_function == 'median' else '' }}>Median</option>
258+
<option value="min" {{ ('selected="selected"' if options.aggregation_function == 'min' else '') | safe }}>Minimum</option>
259+
<option value="max" {{ ('selected="selected"' if options.aggregation_function == 'max' else '') | safe }}>Maximum</option>
260+
<option value="mean" {{ ('selected="selected"' if options.aggregation_function == 'mean' else '') | safe }}>Mean</option>
261+
<option value="median" {{ ('selected="selected"' if options.aggregation_function == 'median' else '') | safe }}>Median</option>
262262
</select>
263263
</td>
264264
</tr>
265265
<tr>
266266
<td><label for="mannwhit">Mann-Whitney test confidence level</label></td>
267267
<td>
268268
<select id="mannwhit" name="MW_confidence_lv">
269-
<option value="0.10" {{ ('selected="selected"' if options.MW_confidence_lv == 0.10 else '')|safe}}>
270-
10%</option>
271-
<option value="0.05" {{ ('selected="selected"' if options.MW_confidence_lv == 0.05 else '')|safe}}>
272-
5%</option>
273-
<option value="0.01" {{ ('selected="selected"' if options.MW_confidence_lv == 0.01 else '')|safe}}>
274-
1%</option>
269+
<option value="0.10" {{ ('selected="selected"' if options.MW_confidence_lv == 0.10 else '') | safe}}>10%</option>
270+
<option value="0.05" {{ ('selected="selected"' if options.MW_confidence_lv == 0.05 else '') | safe}}>5%</option>
271+
<option value="0.01" {{ ('selected="selected"' if options.MW_confidence_lv == 0.01 else '') | safe}}>1%</option>
275272
</select>
276273
</td>
277274
</tr>

0 commit comments

Comments
 (0)