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

Bug 288603: Allow users in the request group to remove pending requests made by others - Patch by Frédéric Buclin <LpSolit@gmail.com> r=myk a=justdave

Bug 288603: Allow users in the request group to remove pending requests made by…
6f4fba59 · lpsolit%gmail.com · fcd963fc · 6f4fba59
Commit 6f4fba59 authored Apr 20, 2005 by lpsolit%gmail.com
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Flag.pm Bugzilla/Flag.pm +5 -2

No files found.
--- 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 "-"