Fix for bug 291391: allows users to rerequest set flags even if they don't have the...

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

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index f5bb9703baa1438fcfa16a40f989fca1cca97ea3..98cd7418ba40537e7ff0f0120564b42018f607ec 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -442,12 +442,10 @@
     [% title = "Flag Modification Denied" %]
     You tried to [% IF status == "+" %] grant [% ELSIF status == "-" %] deny
     [% ELSIF status == "X" %] clear [% ELSE %] request [% END %]
-    <code>[% name FILTER html %]</code>
-    [% IF status == "?" && old_status != "X" %], but this flag is already
-    set[% END %].
-    Only a sufficiently empowered user [% IF status == "X" %] or the user who
-    set <code>[% name FILTER html %][% old_status FILTER html %]</code> in
-    the first place [% END %] can make this change.
+    <code>[% name FILTER html %]
+          [% IF status == "X" %][% old_status FILTER html %][% END %]</code>.
+
+    Only a sufficiently empowered user can make this change.
 
   [% ELSIF error == "format_not_found" %]
     [% title = "Format Not Found" %]