From 3cf96e72e7485278bf3d51719e935b73af04fdf4 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 6 May 2013 14:31:38 +0800
Subject: 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

---
 .../default/hook/bug/create/create-form.html.tmpl  |  3 +--
 .../hook/bug/create/create-guided-form.html.tmpl   | 22 ----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 extensions/BMO/template/en/default/hook/bug/create/create-guided-form.html.tmpl

(limited to 'extensions/BMO/template/en/default/hook/bug/create')

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>
-- 
cgit v1.2.3-24-g4f1b