diff options
| author | David Lawrence <dlawrence@mozilla.com> | 2011-09-30 23:50:01 +0200 |
|---|---|---|
| committer | David Lawrence <dlawrence@mozilla.com> | 2011-09-30 23:50:01 +0200 |
| commit | 77f1cffd26e4e306b46558142a432acdbb67b9f1 (patch) | |
| tree | e79f3e29d233c0afbc8c7928b408b8a6119847dc /template/en/default/admin | |
| parent | f6e81df17967ab414235bcc12d3432df69192f1a (diff) | |
| parent | f517974618ba835014e9d2a3565109af469f5d34 (diff) | |
| download | bugzilla-77f1cffd26e4e306b46558142a432acdbb67b9f1.tar.gz bugzilla-77f1cffd26e4e306b46558142a432acdbb67b9f1.tar.xz | |
merged with bugzilla/4.2
Diffstat (limited to 'template/en/default/admin')
| -rw-r--r-- | template/en/default/admin/flag-type/edit.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/admin/products/groupcontrol/updated.html.tmpl | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index f44c44d9d..2cb985a47 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -262,7 +262,7 @@ [%- group.name FILTER html ~%] </option> [% END %] - [% IF !group_found && type.${selname} %] + [% IF !group_found && type.${selname}.name %] <option value="[% type.${selname}.name FILTER html %]" selected="selected"> [%- type.${selname}.name FILTER html ~%] </option> diff --git a/template/en/default/admin/products/groupcontrol/updated.html.tmpl b/template/en/default/admin/products/groupcontrol/updated.html.tmpl index 2f59cae68..353ce5c75 100644 --- a/template/en/default/admin/products/groupcontrol/updated.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/updated.html.tmpl @@ -27,16 +27,16 @@ title = title %] <p> -[% IF changes.group_controls.now_na.size %] - [% FOREACH g = changes.group_controls.now_na %] +[% IF changes._group_controls.now_na.size %] + [% FOREACH g = changes._group_controls.now_na %] Removing [% terms.bugs %] from group '[% g.name FILTER html %]' which no longer applies to this product<p> [% g.bug_count FILTER html %] [%+ terms.bugs %] removed<p> [% END %] [% END %] -[% IF changes.group_controls.now_mandatory.size %] - [% FOREACH g = changes.group_controls.now_mandatory %] +[% IF changes._group_controls.now_mandatory.size %] + [% FOREACH g = changes._group_controls.now_mandatory %] Adding [% terms.bugs %] to group '[% g.name FILTER html %]' which is mandatory for this product<p> [% g.bug_count FILTER html %] [%+ terms.bugs %] added<p> |