Bug 419191: CC'ed users not being in the group a bug is restricted to cannot do…

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

@@ -650,7 +650,7 @@
 [%############################################################################%]
 
 [% BLOCK section_restrict_visibility %]
-  [% IF bug.groups.size > 0 %]
+  [% RETURN UNLESS bug.groups.size %]
   <table>
     <tr>
       <td class="field_label">
@@ -663,7 +663,8 @@
           [% SET inallgroups = 0 IF NOT group.ingroup %]
           [% SET inagroup = 1 IF group.ison %]
 
-          [% IF NOT group.mandatory %]
+          [% NEXT IF group.mandatory %]
+
           [% IF NOT emitted_description %]
             [% emitted_description = 1 %]
             <div id="bz_restrict_group_visibility_help">
@@ -685,7 +686,6 @@
           <label for="bit-[% group.bit %]">[% group.description FILTER html_light %]</label>
           <br>
         [% END %]
-        [% END %]
 
         [% IF NOT inallgroups %]
           <b>
@@ -696,6 +696,7 @@
         [% END %]
       </td>
     </tr>
+
     [% IF inagroup %]
     <tr>
       <td class="field_label">
@@ -716,19 +717,25 @@
         </div>
         <div>
           <div>
+            [% user_can_edit_accessible = bug.check_can_change_field("reporter_accessible", 0, 1) %]
+            [% IF user_can_edit_accessible %]
               <input type="hidden" name="defined_reporter_accessible" value="1">
+            [% END %]
             <input type="checkbox" value="1"
                    name="reporter_accessible" id="reporter_accessible"
                    [% " checked" IF bug.reporter_accessible %]
-                   [% " disabled=\"disabled\"" UNLESS bug.check_can_change_field("reporter_accessible", 0, 1) %]>
+                   [% " disabled=\"disabled\"" UNLESS user_can_edit_accessible %]>
             <label for="reporter_accessible">Reporter</label>
           </div>
           <div>
+            [% user_can_edit_accessible = bug.check_can_change_field("cclist_accessible", 0, 1) %]
+            [% IF user_can_edit_accessible %]
               <input type="hidden" name="defined_cclist_accessible" value="1">
+            [% END %]
             <input type="checkbox" value="1"
                    name="cclist_accessible" id="cclist_accessible"
                    [% " checked" IF bug.cclist_accessible %]
-                   [% " disabled=\"disabled\"" UNLESS bug.check_can_change_field("cclist_accessible", 0, 1) %]>
+                   [% " disabled=\"disabled\"" UNLESS user_can_edit_accessible %]>
             <label for="cclist_accessible">CC List</label>
           </div>
         </div>
@@ -736,7 +743,6 @@
     </tr>
     [% END %]
   </table>  
-  [% END %]
 [% END %]
 
 [%############################################################################%]