From: jocuri%softhome.net <>
Date: Wed, 3 Nov 2004 06:59:39 +0000 (+0000)
Subject: Patch for bug 212017: Should be able to change a bug if it has a flag requested that... 
X-Git-Tag: bugzilla-2.19.2~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ad9385a463557b40163f890b06a882679962b29;p=thirdparty%2Fbugzilla.git

Patch for bug 212017: Should be able to change a bug if it has a flag requested that is no longer requestable; patch by Frédéric Buclin <LpSolit@netscape.net>; r=myk, vladd, a=myk.
---

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index aca271261b..a58bc7e3a4 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 75e61d774b..c935158428 100644
--- 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 %]