Bug 13534: Remove REMIND and LATER from the default resolution list (only affects...

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index 9378054b39ef8bfe5ec20bdaaf6522ea37ce9430..077f93cf70bcb8586102b7e816b9b3eaa70fa41c 100644 (file)
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -68,8 +68,8 @@ use constant ENUM_DEFAULTS => {
     rep_platform => ["All","PC","Macintosh","Other"],
     bug_status   => ["UNCONFIRMED","NEW","ASSIGNED","REOPENED","RESOLVED",
                      "VERIFIED","CLOSED"],
-    resolution   => ["","FIXED","INVALID","WONTFIX","LATER","REMIND",
-                     "DUPLICATE","WORKSFORME","MOVED"],
+    resolution   => ["","FIXED","INVALID","WONTFIX", "DUPLICATE","WORKSFORME",
+                     "MOVED"],
 };
 
 #####################################################################

diff --git a/contrib/gnats2bz.pl b/contrib/gnats2bz.pl
index 7a509682e15ec861e5db58cf26a16f10e6fafddc..95ae32ad980ccf06ddff68e549b376490e211193 100644 (file)
--- a/contrib/gnats2bz.pl
+++ b/contrib/gnats2bz.pl
@@ -649,7 +649,7 @@ sub write_bugs {
         }
     } elsif ($pr_data{"State"} eq "suspended") {
         $bug_status = "RESOLVED";
-        $resolution = "LATER";
+        $resolution = "WONTFIX";
     } else {
         $bug_status = "NEW";
         $resolution = "";

diff --git a/docs/images/bzLifecycle.xml b/docs/images/bzLifecycle.xml
index d4c33c96c37502fdb84f6b75cb37d01cb5eb464d..1adc6b70c5f70cdbf584f5157ce8749404ab490b 100644 (file)
--- a/docs/images/bzLifecycle.xml
+++ b/docs/images/bzLifecycle.xml
@@ -1118,9 +1118,7 @@ possession#</dia:string>
   DUPLICATE
   WONTFIX
   WORKSFORME
-  INVALID
-  REMIND
-  LATER#</dia:string>
+  INVALID#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="sans" style="0" name="Helvetica"/>

diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index f7600dc0d24ef4dead23ea2ca1cce54a9ef375a9..254bfef1db826d438894295da550761ccc01a974 100644 (file)
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -91,8 +91,6 @@
 [% resolution_descs = { "FIXED"      => "FIXED",
                         "INVALID"    => "INVALID",
                         "WONTFIX"    => "WONTFIX",
-                        "LATER"      => "LATER",
-                        "REMIND"     => "REMIND",
                         "DUPLICATE"  => "DUPLICATE",
                         "WORKSFORME" => "WORKSFORME",
                         "MOVED"      => "MOVED",