Bug 288603: Allow users in the request group to remove pending requests made by other...

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 29215876ab030f9a5573c4bdc5230c0f4a079c9c..de9c3d23b8a817a00b08ba973aebdfb81c8ed9f3 100644 (file)
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -320,8 +320,11 @@ sub validate {
         # - The flag is unchanged
         next if ($status eq $flag->{status});
 
-        # - User can clear flags set by itself
-        next if (($status eq "X") && ($user->id eq $flag->{setter}->id));
+        # - User in the $request_gid group can clear pending requests
+        next if ($status eq 'X'
+                 && $flag->{status} eq '?'
+                 && (!$flag->{type}->{request_gid}
+                     || $user->in_group(&::GroupIdToName($flag->{type}->{request_gid}))));
 
         # - User in the $grant_gid group can set/clear flags,
         #   including "+" and "-"