From 0d39e7b417190ad672219768eab41d627cc68bb9 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Fri, 25 Jun 2010 14:16:27 -0700
Subject: Bug 573173: Make Bugzilla::Bug's add_group and remove_group take
 group names instead of ids r=dkl, a=mkanat

---
 .../bug/process/verify-new-product.html.tmpl       | 33 +++++++++++-----------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'template/en/default/bug/process/verify-new-product.html.tmpl')

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 1cc186c44..20270c0aa 100644
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -40,7 +40,7 @@
 
 [% SET exclude_items = ['version', 'component', 'target_milestone'] %]
 [% IF verify_bug_groups %]
-  [% exclude_items.push('bit-\d+') %]
+  [% exclude_items.push('groups', 'defined_groups') %]
 [% END %]
 [% Hook.process('exclude') %]
 
@@ -124,9 +124,10 @@
     [%+ terms.Bugs %] will no longer be restricted to these groups and may become
     public if no other group applies:<br>
     [% FOREACH group = old_groups %]
-      <input type="checkbox" id="bit-[% group.id FILTER html %]"
-             name="bit-[% group.id FILTER html %]" disabled="disabled" value="1">
-      <label for="bit-[% group.id FILTER html %]">
+      <input type="checkbox" id="group_[% group.group.id FILTER html %]"
+             name="groups" disabled="disabled"
+             value="[% group.group.name FILTER html %]">
+      <label for="group_[% group.group.id FILTER html %]">
         [% group.name FILTER html %]: [% group.description FILTER html %]
       </label>
       <br>
@@ -154,16 +155,15 @@
     <p>These groups are optional. You can decide to restrict [% terms.bugs %] to
     one or more of the following groups:<br>
     [% FOREACH group = optional_groups %]
-      <input type="hidden" name="defined_bit-[% group.group.id FILTER html %]"
-             value="1">
-      <input type="checkbox" id="bit-[% group.group.id FILTER html %]"
-             name="bit-[% group.group.id FILTER html %]"
-             [%+ ((group.membercontrol == constants.CONTROLMAPDEFAULT && user.in_group(group.group.name))
+      <input type="hidden" name="defined_groups"
+             value="[% group.group.name FILTER html %]">
+      <input type="checkbox" id="group_[% group.group.id FILTER html %]"
+             name="groups"
+             [% ' checked="checked"' IF ((group.membercontrol == constants.CONTROLMAPDEFAULT && user.in_group(group.group.name))
                  || (group.othercontrol == constants.CONTROLMAPDEFAULT && !user.in_group(group.group.name))
-                 || cgi.param("bit-$group.group.id") == 1) ?
-                 'checked="checked"' : ''
-             %] value="1">
-      <label for="bit-[% group.group.id FILTER html %]">
+                 || cgi.param("groups").contains(group.group.name)) %]
+             %] value="[% group.group.name FILTER html %]">
+      <label for="group_[% group.group.id FILTER html %]">
         [% group.group.name FILTER html %]: [% group.group.description FILTER html %]
       </label>
       <br>
@@ -175,9 +175,10 @@
     <p>These groups are mandatory and [% terms.bugs %] will be automatically
     restricted to these groups:<br>
     [% FOREACH group = mandatory_groups %]
-      <input type="checkbox" id="bit-[% group.group.id FILTER html %]" checked="checked"
-             name="bit-[% group.group.id FILTER html %]" value="1" disabled="disabled">
-      <label for="bit-[% group.group.id FILTER html %]">
+      <input type="checkbox" id="group_[% group.group.id FILTER html %]"
+              checked="checked" disabled="disabled"
+             name="groups" value="[% group.group.name FILTER html %]">
+      <label for="group_[% group.group.id FILTER html %]">
         [% group.group.name FILTER html %]: [% group.group.description FILTER html %]
       </label>
       <br>
-- 
cgit v1.2.3-24-g4f1b