Bug 578762: When moving a bug into another product, the "Verify Bug Group"…

Bug 578762: When moving a bug into another product, the "Verify Bug Group" section should not appear if no groups are applicable r/a=LpSolit

Bug 578762: When moving a bug into another product, the "Verify Bug Group"…
c167fd0d · Sunil Joshi · Frédéric Buclin · 95d48136 · c167fd0d
Commit c167fd0d authored Nov 16, 2012 by Sunil Joshi Committed by Frédéric Buclin Nov 16, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 16 deletions

verify-new-product.html.tmpl template/en/default/bug/process/verify-new-product.html.tmpl +19 -16

No files found.
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -100,7 +100,25 @@
 </table>

 [% IF verify_bug_groups %]
-  <h3>Verify [% terms.Bug %] Group</h3>
+  [% mandatory_groups = [] %]
+  [% optional_groups = [] %]
+
+  [% FOREACH gid = product.group_controls.keys %]
+    [% group = product.group_controls.$gid %]
+    [% NEXT UNLESS group.group.is_active %]
+
+    [% IF group.membercontrol == constants.CONTROLMAPMANDATORY
+          || (group.othercontrol ==  constants.CONTROLMAPMANDATORY && !user.in_group(group.group.name)) %]
+      [% mandatory_groups.push(group) %]
+    [% ELSIF (group.membercontrol != constants.CONTROLMAPNA && user.in_group(group.group.name))
+              || group.othercontrol != constants.CONTROLMAPNA %]
+      [% optional_groups.push(group) %]
+    [% END %]
+  [% END %]
+  
+  [% IF old_groups.size || optional_groups.size || mandatory_groups.size %]
+    <h3>Verify [% terms.Bug %] Group</h3>
+  [% END %]
  
  [% IF old_groups.size %]
    <p>These groups are not legal for the '[% product.name FILTER html %]'
@@ -118,21 +136,6 @@
    </p>
  [% END %]

-  [% mandatory_groups = [] %]
-  [% optional_groups = [] %]
-
-  [% FOREACH gid = product.group_controls.keys %]
-    [% group = product.group_controls.$gid %]
-    [% NEXT UNLESS group.group.is_active %]
-
-    [% IF group.membercontrol == constants.CONTROLMAPMANDATORY
-          || (group.othercontrol ==  constants.CONTROLMAPMANDATORY && !user.in_group(group.group.name)) %]
-      [% mandatory_groups.push(group) %]
-    [% ELSIF (group.membercontrol != constants.CONTROLMAPNA && user.in_group(group.group.name))
-              || group.othercontrol != constants.CONTROLMAPNA %]
-      [% optional_groups.push(group) %]
-    [% END %]
-  [% END %]

  [% IF optional_groups.size %]
    <p>These groups are optional. You can decide to restrict [% terms.bugs %] to