Bug 385209: Part 2: Only consider */NA and */MANDATORY when the bug is being…

Bug 385209: Part 2: Only consider */NA and */MANDATORY when the bug is being moved to another product - Patch by FrÃdÃric Buclin <LpSolit@gmail.com> r=mkanat a=LpSolit

Bug 385209: Part 2: Only consider /NA and /MANDATORY when the bug is being…
8ec3f6fc · lpsolit%gmail.com · f8f988fb · 8ec3f6fc
Commit 8ec3f6fc authored 17 years ago by lpsolit%gmail.com
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

process_bug.cgi process_bug.cgi +7 -5

No files found.
--- a/process_bug.cgi
+++ b/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")))
        {