From 730eebe9d64699077d22f87ff8aba083b83cbc2e Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com"
 <lpsolit%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 3 Jul 2007 22:27:13 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20385209:=20Part=202:=20Only=20consider=20*?=
 =?UTF-8?q?/NA=20and=20*/MANDATORY=20when=20the=20bug=20is=20being=20moved?=
 =?UTF-8?q?=20to=20another=20product=20-=20Patch=20by=20Fr=C3=83=C2=A9d?=
 =?UTF-8?q?=C3=83=C2=A9ric=20Buclin=20<LpSolit@gmail.com>=20r=3Dmkanat=20a?=
 =?UTF-8?q?=3DLpSolit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.0.0.236/trunk@229284 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/process_bug.cgi | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mozilla/webtools/bugzilla/process_bug.cgi b/mozilla/webtools/bugzilla/process_bug.cgi
index f2a174dee34..4b5d0ec5436 100755
--- a/mozilla/webtools/bugzilla/process_bug.cgi
+++ b/mozilla/webtools/bugzilla/process_bug.cgi
@@ -1358,21 +1358,23 @@ foreach my $id (@idlist) {
         # Leave inactive groups alone.
         next unless $group->{group}->is_active;
 
+        # Only members of a group can add/remove the bug to/from it,
+        # unless the bug is being moved to another product in which case
+        # non-members can also edit group restrictions.
         if ($group->{membercontrol} == CONTROLMAPMANDATORY
-            || ($group->{othercontrol} == CONTROLMAPMANDATORY && !$user->in_group_id($gid)))
+            || ($product_change && $group->{othercontrol} == CONTROLMAPMANDATORY
+                && !$user->in_group_id($gid)))
         {
             $updated_groups{$gid} = $group->{group}->name;
         }
         elsif ($group->{membercontrol} == CONTROLMAPNA
-               || ($group->{othercontrol} == CONTROLMAPNA && !$user->in_group_id($gid)))
+               || ($product_change && $group->{othercontrol} == CONTROLMAPNA
+                   && !$user->in_group_id($gid)))
         {
             delete $updated_groups{$gid};
         }
         # When editing several bugs at once, only consider groups which
         # have been displayed.
-        # Only members of a group can add/remove the bug to/from it,
-        # unless the bug is being moved to another product in which case
-        # non-members can also edit group restrictions.
         elsif (($user->in_group_id($gid) || $product_change)
                && (defined $cgi->param('id') || defined $cgi->param("bit-$gid")))
         {