summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-05-06 08:31:38 +0200
committerByron Jones <bjones@mozilla.com>2013-05-06 08:31:38 +0200
commit3cf96e72e7485278bf3d51719e935b73af04fdf4 (patch)
tree74fa7fb4516c1adfe567b198c5d5944517a78bdf /template
parente99876edf0c74a0924856ba7e7f988457b18478b (diff)
downloadbugzilla-3cf96e72e7485278bf3d51719e935b73af04fdf4.tar.gz
bugzilla-3cf96e72e7485278bf3d51719e935b73af04fdf4.tar.xz
Bug 825886: When moving bugs from one product to another, I should be able to keep a security bug private across groups that I'm not a member of
Diffstat (limited to 'template')
-rw-r--r--template/en/default/bug/create/create.html.tmpl11
-rw-r--r--template/en/default/bug/process/verify-new-product.html.tmpl9
2 files changed, 15 insertions, 5 deletions
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 7f2087467..786fab551 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -766,7 +766,14 @@ TUI_hide_default('attachment_text_field');
[% END %]
<tbody class="expert_fields">
- [% IF product.groups_available.size %]
+ [%# BMO - 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>&nbsp;</th>
<td colspan="3">
@@ -782,7 +789,7 @@ TUI_hide_default('attachment_text_field');
<!-- 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)
diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl
index c02c26470..1d2e8689f 100644
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -120,9 +120,9 @@
[% IF old_groups.size %]
<p>These groups are not legal for the '[% product.name FILTER html %]'
- product or you are not allowed to restrict [% terms.bugs %] to these groups.
- [%+ terms.Bugs %] will no longer be restricted to these groups and may become
- public if no other group applies:<br>
+ product or you are not allowed to restrict [% terms.bugs %] to these groups.<br>
+ <b>[%+ terms.Bugs %] will no longer be restricted to these groups and may become
+ public if no other group applies:</b><br>
[% FOREACH group = old_groups %]
<input type="checkbox" id="group_[% group.id FILTER html %]"
name="groups" disabled="disabled" value="[% group.name FILTER html %]">
@@ -150,6 +150,9 @@
[% END %]
[% END %]
+ [%# BMO - check the default product sec-group to avoid accidental removal of all groups %]
+ [% CALL Bugzilla.check_default_product_security_group(product, old_groups, optional_groups) %]
+
[% IF optional_groups.size %]
<p>These groups are optional. You can decide to restrict [% terms.bugs %] to
one or more of the following groups:<br>