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

template/en/default/bug/edit.html.tmpl

@@ -703,14 +703,11 @@
 
 [% BLOCK section_restrict_visibility %]
   [% RETURN UNLESS bug.groups.size %]
-  <table class="bz_group_visibility_section">
-    <tr>
-      <td class="field_label">
-        <label id="bz_restrict_group_visibility_label"><b> Restrict Group Visibility</b>:</label>
-      </td>
-      <td>
+
   [% inallgroups = 1 %]
   [% inagroup = 0 %]
+  [% emitted_description = 0 %]
+
   [% FOREACH group = bug.groups %]
     [% SET inallgroups = 0 IF NOT group.ingroup %]
     [% SET inagroup = 1 IF group.ison %]
@@ -719,6 +716,12 @@
 
     [% IF NOT emitted_description %]
       [% emitted_description = 1 %]
+      <table class="bz_group_visibility_section">
+        <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>
@@ -731,25 +734,28 @@
     [% 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 %]>
+    <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 emitted_description %]
     [% IF NOT inallgroups %]
-          <b>
-            Only members of a group can change the visibility of [% terms.abug %] for
-            that group.
-          </b>
+      <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 NOT emitted_description %]
+      [% emitted_description = 1 %]
+      <table class="bz_group_visibility_section">
+    [% END %]
     <tr>
       <td class="field_label">
         <label id="bz_enable_role_visibility_label"><b>Enable Role Visibility</b>:</label>
@@ -793,8 +799,8 @@
         </div>
       </td>
     </tr>
-    [% END %]
   </table>
+  [% END %]
 [% END %]
 
 [%############################################################################%]