Bug 471461: Incorrect text displayed about groups when a bug is in a product which...

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 9923f004948b805c172360938d29287b41936208..452bb80b55ddc3ea47a065889fbca6e40b7b8b19 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -689,22 +689,25 @@
 
 [% BLOCK section_restrict_visibility %]
   [% RETURN UNLESS bug.groups.size %]
-  <table>
-    <tr>
-      <td class="field_label">
-        <label id="bz_restrict_group_visibility_label"><b> Restrict Group Visibility</b>:</label>
-      </td>
-      <td>
-        [% inallgroups = 1 %]
-        [% inagroup = 0 %]
-        [% FOREACH group = bug.groups %]
-          [% SET inallgroups = 0 IF NOT group.ingroup %]
-          [% SET inagroup = 1 IF group.ison %]
 
-          [% NEXT IF group.mandatory %]
+  [% inallgroups = 1 %]
+  [% inagroup = 0 %]
+  [% emitted_description = 0 %]
+
+  [% FOREACH group = bug.groups %]
+    [% SET inallgroups = 0 IF NOT group.ingroup %]
+    [% SET inagroup = 1 IF group.ison %]
+
+    [% NEXT IF group.mandatory %]
 
-          [% IF NOT emitted_description %]
-            [% emitted_description = 1 %]
+    [% IF NOT emitted_description %]
+      [% emitted_description = 1 %]
+      <table>
+        <tr>
+          <td class="field_label">
+            <label id="bz_restrict_group_visibility_label"><b>Restrict Group Visibility</b>:</label>
+          </td>
+          <td>
             <div id="bz_restrict_group_visibility_help">
               <b>Only users in all of the selected groups can view this [% terms.bug %]:</b>
               <br>
@@ -712,30 +715,33 @@
                 (Unchecking all boxes makes this a more public [% terms.bug %].)
               </small>
             </div>
-          [% END %]
+    [% END %]
 
-          [% IF group.ingroup %]
-            <input type="hidden" name="defined_bit-[% group.bit %]" value="1">
-          [% END %]
-          <input type="checkbox" value="1"
-                 name="bit-[% group.bit %]" id="bit-[% group.bit %]"
-                 [% " checked=\"checked\"" IF group.ison %]
-                 [% " disabled=\"disabled\"" IF NOT group.ingroup %]>
-          <label for="bit-[% group.bit %]">[% group.description FILTER html_light %]</label>
-          <br>
-        [% END %]
+    [% IF group.ingroup %]
+      <input type="hidden" name="defined_bit-[% group.bit %]" value="1">
+    [% END %]
+    <input type="checkbox" value="1" name="bit-[% group.bit %]" id="bit-[% group.bit %]"
+           [% ' checked="checked"' IF group.ison %]
+           [% ' disabled="disabled"' IF NOT group.ingroup %]>
+    <label for="bit-[% group.bit %]">[% group.description FILTER html_light %]</label>
+    <br>
+  [% END %]
 
-        [% IF NOT inallgroups %]
-          <b>
-            Only members of a group can change the visibility of [% terms.abug %] for
-            that group.
-          </b>
-          <br>
-        [% END %]
+  [% IF emitted_description %]
+    [% IF NOT inallgroups %]
+      <b>Only members of a group can change the visibility of [% terms.abug %] for that group.</b>
+      <br>
+    [% END %]
       </td>
     </tr>
+    [% "</table>" IF NOT inagroup %]
+  [% END %]
 
-    [% IF inagroup %]
+  [% IF inagroup %]
+    [% IF NOT emitted_description %]
+      [% emitted_description = 1 %]
+      <table>
+    [% END %]
     <tr>
       <td class="field_label">
         <label id="bz_enable_role_visibility_label"><b>Enable Role Visibility</b>:</label>
@@ -779,8 +785,8 @@
         </div>
       </td>
     </tr>
-    [% END %]
-  </table>  
+  </table>
+  [% END %]
 [% END %]
 
 [%############################################################################%]