From 2dec6dcbe885cfd804fb003337b5ef61737c82b9 Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Tue, 6 Dec 2016 20:18:08 +0000
Subject: Bug 1215501 - [modal ui only?] When moving a bug to a different
 product and removing a security-group, the other product's security group
 gets added automatically anyway

---
 .../default/bug_modal/new_product_groups.html.tmpl | 31 +++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'extensions/BugModal/template/en')

diff --git a/extensions/BugModal/template/en/default/bug_modal/new_product_groups.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/new_product_groups.html.tmpl
index d3e4c4574..2f1787b75 100644
--- a/extensions/BugModal/template/en/default/bug_modal/new_product_groups.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/new_product_groups.html.tmpl
@@ -15,34 +15,34 @@
   #%]
 
 [% PROCESS group_list
-    group_set = groups.invalid
-    label     = "Groups that are not valid for the '" _ product.name _ "' product:"
-    enabled   = 0
-    disabled  = 1
+    type     = "invalid"
+    label    = "Groups that are not valid for the '" _ product.name _ "' product:"
+    enabled  = 0
+    disabled = 1
 %]
 [% PROCESS group_list
-    group_set = groups.mandatory
-    label     = "Mandatory '" _ product.name _ "' groups:"
-    enabled   = 1
-    disabled  = 1
+    type     = "mandatory"
+    label    = "Mandatory '" _ product.name _ "' groups:"
+    enabled  = 1
+    disabled = 1
 %]
 [% PROCESS group_list
-    group_set = groups.optional
-    label     = "Optional '" _ product.name _ "' groups:"
-    enabled   = 1
-    disabled  = 0
+    type     = "optional"
+    label    = "Optional '" _ product.name _ "' groups:"
+    enabled  = 1
+    disabled = 0
 %]
 <input type="hidden" name="group_verified" value="1">
 
 [% BLOCK group_list %]
-  [% RETURN UNLESS group_set.size %]
+  [% RETURN UNLESS groups.$type.size %]
   [% FILTER collapse %]
     <div>
       <div>
         [% label FILTER html %]
       </div>
 
-      [% FOREACH g = group_set %]
+      [% FOREACH g = groups.$type %]
         <div>
           [% IF g.checked %]
             <input type="hidden" name="defined_groups" value="[% g.name FILTER html %]">
@@ -51,7 +51,8 @@
             id="group_[% g.id FILTER none %]"
             [%= IF enabled %]name="groups"[% END %]
             [%= "checked" IF g.checked %]
-            [%= "disabled" IF disabled %]>
+            [%= "disabled" IF disabled %]
+            [%= 'data-mandatory="1"' IF type == "mandatory" %]>
           <label for="group_[% g.id FILTER none %]" [%= IF disabled %]class="group-disabled"[% END %]>
             [% g.description FILTER html %]
           </label>
-- 
cgit v1.2.3-24-g4f1b