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

5 files changed, 21 insertions, 36 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>&nbsp;</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)
diff --git a/extensions/BMO/template/en/default/hook/bug/create/create-form.html.tmpl b/extensions/BMO/template/en/default/hook/bug/create/create-form.html.tmpl
index cbe921c76..3fdec2990 100644
--- a/extensions/BMO/template/en/default/hook/bug/create/create-form.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/create/create-form.html.tmpl
@@ -1,9 +1,8 @@
   <tr>
     <th>Security:</th>
     <td colspan="3">
-      [% sec_group = sec_groups.${product.name} || sec_groups._default %]
       [% PROCESS group_checkbox
-                 name = sec_group
+                 name = product.default_security_group
                  desc = "Many users could be harmed by this security problem: " _
                         "it should be kept hidden from the public until it is resolved."
       %]
diff --git a/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl b/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl
deleted file mode 100644
index a0fff4175..000000000
--- a/extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl
+++ /dev/null
@@ -1,22 +0,0 @@
-  <tr bgcolor="[% tablecolour FILTER html %]">
-    <td valign="middle" align="right">
-      <b>Security</b>
-    </td>
-    <td valign="top">
-      <p>
-        [% sec_group = sec_groups.${product.name} || sec_groups._default %]
-
-        <input type="checkbox" name="groups" 
-               id="groups" value="[% sec_group FILTER none %]"
-          [% FOREACH g = group %]
-            [% IF g.name == sec_group %]
-              [% " checked=\"checked\"" IF g.checked %]
-            [% END %]
-          [% END %]
-        >
-        <label for="groups">
-        Many users could be harmed by this security problem: it should be kept
-        hidden from the public until it is resolved.</label>
-      </p>
-    </td>
-  </tr>