Patch for bug 212017: Should be able to change a bug if it has a flag requested that...

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index aca271261b40e200148da248dacdb2395d12680f..a58bc7e3a48696a1eac9c0520877c8032503405e 100644 (file)
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -166,7 +166,9 @@ sub validate {
                             { id => $id, status => $status });
                 
         # Make sure the user didn't request the flag unless it's requestable.
-        if ($status eq '?' && !$flag->{type}->{is_requestable}) {
+        # If the flag was requested before it became unrequestable, leave it as is.
+        if ($status eq '?' && $flag->{status} ne '?' && 
+            !$flag->{type}->{is_requestable}) {
             ThrowCodeError("flag_status_invalid", 
                            { id => $id, status => $status });
         }

diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 75e61d774bd71de776903bbf2d341c8d0edea911..c93515842838da54a97e084807e1a974d0e88926 100644 (file)
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -103,7 +103,7 @@
             [% IF type.is_active %]
               <option value="+" [% "selected" IF flag.status == "+" %]>+</option>
               <option value="-" [% "selected" IF flag.status == "-" %]>-</option>
-              [% IF type.is_requestable %]
+              [% IF type.is_requestable || flag.status == "?" %]
                 <option value="?" [% "selected" IF flag.status == "?" %]>?</option>
               [% END %]
             [% ELSE %]