summaryrefslogtreecommitdiffstats
path: root/template/en/default/list
diff options
context:
space:
mode:
authorMatt Selsky <selsky@columbia.edu>2014-12-11 19:00:18 +0100
committerGervase Markham <gerv@gerv.net>2014-12-11 19:00:18 +0100
commit4d1c399ff6391b70e15a2c06d5bec10e2aaa3d3c (patch)
tree28bc9ec2a5f74208167baed68cbaebe26b451c8c /template/en/default/list
parent7b8a5d16b6c84b0f2b8b8074e9f63888ca6df249 (diff)
downloadbugzilla-4d1c399ff6391b70e15a2c06d5bec10e2aaa3d3c.tar.gz
bugzilla-4d1c399ff6391b70e15a2c06d5bec10e2aaa3d3c.tar.xz
Bug 1102842 - remove and/or unwhitelist unsafe filters. r=gerv, a=simon.
Diffstat (limited to 'template/en/default/list')
-rw-r--r--template/en/default/list/change-columns.html.tmpl2
-rw-r--r--template/en/default/list/edit-multiple.html.tmpl12
2 files changed, 10 insertions, 4 deletions
diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
index c0279803c..aef352d0f 100644
--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -31,7 +31,7 @@
[% FOREACH column = columns.keys %]
[% NEXT IF collist.contains(column) %]
[%# We lowecase the keys so that the sort happens case-insensitively. %]
- [% SET column_desc = field_descs.$column || column FILTER lower %]
+ [% SET column_desc = field_descs.$column || column FILTER lower FILTER html %]
[% available_columns.$column_desc = column %]
[% END %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index e581f0892..d956fa62b 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -371,7 +371,13 @@
<td>
[% SET inactive = !group.is_active %]
- [% group.description FILTER html_light FILTER inactive(inactive) %]
+ [% IF inactive %]
+ <span class="bz_inactive">
+ [% END %]
+ [% group.description FILTER html_light %]
+ [% IF inactive %]
+ </span>
+ [% END %]
</td>
</tr>
@@ -380,8 +386,8 @@
</table>
[% IF foundinactive %]
- <p class="bz_info">(Note: [% terms.Bugs %] may not be added to [% FILTER inactive %]inactive
- groups[% END %], only removed.)</p>
+ <p class="bz_info">(Note: [% terms.Bugs %] may not be added to inactive
+ groups, only removed.)</p>
[% END %]
[% END %]