diff options
Diffstat (limited to 'extensions/BMO/template/en/default/bug/create')
3 files changed, 20 insertions, 12 deletions
diff --git a/extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl index cdfd90174..6e2778de0 100644 --- a/extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-bootgecko-partner.html.tmpl @@ -210,9 +210,8 @@ <tr> <th>Security:</th> <td> - [% sec_group = sec_groups.${product.name} || sec_groups._default %] - <input type="checkbox" name="groups" - value="[% sec_group FILTER html %]" id="group_[% sec_group FILTER html %]" + <input type="checkbox" name="groups" id="default_security_group" + value="[% product.default_security_group FILTER html %]" [% FOREACH g = group %] [% IF g.name == name %] [% ' checked="checked"' IF g.checked %] @@ -220,8 +219,8 @@ [% END %] [% END %] > - <label for="group_[% sec_group FILTER html %]"> - Many users could be harmed by this security problem: + <label for="default_security_group"> + Many users could be harmed by this security problem: it should be kept hidden from the public until it is resolved. </label> </td> diff --git a/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl index cd3466fe7..f79363c99 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl @@ -252,11 +252,13 @@ strong.required:before { </p> <p id="detail_secure"> - [% sec_group = sec_groups.${product.name} || sec_groups._default %] - <input type="checkbox" name="groups" id="groups" value="[% sec_group FILTER html %]"> - <label for="groups"><strong>This <span id="secure_type">report</span> is about a problem - that is putting users at risk. It should be kept hidden from the public until it is - resolved.</strong></label> + <input type="checkbox" name="groups" id="groups" + value="[% product.default_security_group FILTER html %]"> + <label for="groups"> + <strong>This <span id="secure_type">report</span> is about a problem + that is putting users at risk. It should be kept hidden from the public + until it is resolved.</strong> + </label> </p> <input type="submit" id="commit" value="Submit"></td> diff --git a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl index ad8216b47..cc4a8641d 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl @@ -565,7 +565,14 @@ TUI_hide_default('expert_fields'); </tbody> <tbody class="expert_fields"> - [% IF product.groups_available.size %] + [%# exclude the default security from from the groups_available %] + [%# list, as it will be added by the BMO extension %] + [% groups_available = [] %] + [% FOREACH group (product.groups_available) %] + [% NEXT IF group.name == product.default_security_group %] + [% groups_available.push(group) %] + [% END %] + [% IF groups_available.size %] <tr> <th> </th> <td colspan="3"> @@ -583,7 +590,7 @@ TUI_hide_default('expert_fields'); <!-- Checkboxes --> <input type="hidden" name="defined_groups" value="1"> - [% FOREACH group = product.groups_available %] + [% FOREACH group = groups_available %] <input type="checkbox" id="group_[% group.id FILTER html %]" name="groups" value="[% group.name FILTER html %]" [% ' checked="checked"' IF default.groups.contains(group.name) |