From ecffc754801d578f7ad32e8f5d6ca3321812943a Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <lpsolit%gmail.com>
Date: Tue, 19 Apr 2005 18:11:41 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20288603:=20Allow=20users=20in=20the=20requ?=
 =?UTF-8?q?est=20group=20to=20remove=20pending=20requests=20made=20by=20ot?=
 =?UTF-8?q?hers=20-=20Patch=20by=20Fr=EF=BF=BDd=EF=BF=BDric=20Buclin=20<Lp?=
 =?UTF-8?q?Solit@gmail.com>=20r=3Dmyk=20a=3Djustdave?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webtools/bugzilla/Bugzilla/Flag.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/webtools/bugzilla/Bugzilla/Flag.pm b/webtools/bugzilla/Bugzilla/Flag.pm
index 29215876ab0..de9c3d23b8a 100644
--- a/webtools/bugzilla/Bugzilla/Flag.pm
+++ b/webtools/bugzilla/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 "-"