From 0803661d1a815ad51904d14904fc54d2e3b73e64 Mon Sep 17 00:00:00 2001
From: "jocuri%softhome.net" <>
Date: Wed, 3 Nov 2004 06:59:23 +0000
Subject: [PATCH] =?utf8?q?Patch=20for=20bug=20212017:=20Should=20be=20able?=
 =?utf8?q?=20to=20change=20a=20bug=20if=20it=20has=20a=20flag=20requested?=
 =?utf8?q?=20that=20is=20no=20longer=20requestable;=20patch=20by=20Fr?=
 =?utf8?q?=C3=A9d=C3=A9ric=20Buclin=20<LpSolit@netscape.net>;=20r=3Dmyk,?=
 =?utf8?q?=20vladd,=20a=3Dmyk.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Flag.pm                        | 4 +++-
 template/en/default/flag/list.html.tmpl | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 7254be1175..a246394ba5 100644
--- 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 1b99bfb6d5..cb7ff0d487 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -100,7 +100,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 %]
-- 
2.47.2