From ac905a580c68bcf9b4ddaaff636969575aab4c64 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Wed, 30 Sep 2009 08:55:03 +0000
Subject: Bug 488931: Change the default priority values to be human-readable
 words instead of P1, P2, etc. Patch by Max Kanat-Alexander
 <mkanat@bugzilla.org> r=dkl, a=mkanat

---
 Bugzilla/DB.pm                             |  2 +-
 contrib/bugzilla-submit/bugzilla-submit    |  2 +-
 contrib/gnats2bz.pl                        | 14 +++++++-------
 contrib/gnatsparse/gnatsparse.py           | 12 ++++++------
 template/en/default/pages/fields.html.tmpl |  6 ++----
 5 files changed, 17 insertions(+), 19 deletions(-)
 mode change 100644 => 100755 contrib/gnats2bz.pl

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index f39eb6511..24c1f24f9 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -65,7 +65,7 @@ use constant ISOLATION_LEVEL => 'REPEATABLE READ';
 use constant ENUM_DEFAULTS => {
     bug_severity  => ['blocker', 'critical', 'major', 'normal',
                       'minor', 'trivial', 'enhancement'],
-    priority     => ["P1","P2","P3","P4","P5"],
+    priority     => ["Highest", "High", "Normal", "Low", "Lowest", "---"],
     op_sys       => ["All","Windows","Mac OS","Linux","Other"],
     rep_platform => ["All","PC","Macintosh","Other"],
     bug_status   => ["UNCONFIRMED","NEW","ASSIGNED","REOPENED","RESOLVED",
diff --git a/contrib/bugzilla-submit/bugzilla-submit b/contrib/bugzilla-submit/bugzilla-submit
index 47c94b275..e1e9b64d8 100755
--- a/contrib/bugzilla-submit/bugzilla-submit
+++ b/contrib/bugzilla-submit/bugzilla-submit
@@ -158,7 +158,7 @@ def ensure_defaults(data):
     if 'bug_file_loc' not in data:
         data['bug_file_loc'] = 'http://'        # Yes, Bugzilla needs this
     if 'priority' not in data:
-        data['priority'] = 'P2'
+        data['priority'] = 'Normal'
 
 def validate_fields(data):
     # Fields for validation
diff --git a/contrib/gnats2bz.pl b/contrib/gnats2bz.pl
old mode 100644
new mode 100755
index 0cd6a3258..27f3ad84a
--- a/contrib/gnats2bz.pl
+++ b/contrib/gnats2bz.pl
@@ -606,25 +606,25 @@ sub write_bugs {
     # Mapping from Severity,Priority to priority
     # At our site, the Severity,Priority fields have degenerated
     # into a 9-level priority field.
-    my($priority) = "P1";
+    my($priority) = "Highest";
     if (defined($pr_data{"Severity"}) && defined($pr_data{"Severity"})) {
         if ($pr_data{"Severity"} eq "critical") {
             if ($pr_data{"Priority"} eq "high") {
-                $priority = "P1";
+                $priority = "Highest";
             } else {
-                $priority = "P2";
+                $priority = "High";
             }
         } elsif ($pr_data{"Severity"} eq "serious") {
             if ($pr_data{"Priority"} eq "low") {
-                $priority = "P4";
+                $priority = "Low";
             } else {
-                $priority = "P3";
+                $priority = "Normal";
             }
         } else {
             if ($pr_data{"Priority"} eq "high") {
-                $priority = "P4";
+                $priority = "Low";
             } else {
-                $priority = "P5";
+                $priority = "Lowest";
             }
         }
     }
diff --git a/contrib/gnatsparse/gnatsparse.py b/contrib/gnatsparse/gnatsparse.py
index 21ec7a840..9eef18b89 100755
--- a/contrib/gnatsparse/gnatsparse.py
+++ b/contrib/gnatsparse/gnatsparse.py
@@ -552,19 +552,19 @@ class Bugzillabug(object):
             priority = self.fields["Priority"]
             if severity == "critical":
                 if priority == "high":
-                    self.fields["priority"] = "P1"
+                    self.fields["priority"] = "Highest"
                 else:
-                    self.fields["priority"] = "P2"
+                    self.fields["priority"] = "High"
             elif severity == "serious":
                 if priority == "low":
-                    self.fields["priority"] = "P4"
+                    self.fields["priority"] = "Low"
                 else:
-                    self.fields["priority"] = "P3"
+                    self.fields["priority"] = "Normal"
             else:
                 if priority == "high":
-                    self.fields["priority"] = "P4"
+                    self.fields["priority"] = "Low"
                 else:
-                    self.fields["priority"] = "P5"
+                    self.fields["priority"] = "Lowest"
         self.fields["priority"] = SqlQuote(self.fields["priority"])
         state = self.fields["State"]
         if (state == "open" or state == "analyzed") and self.fields["userid"] != 3:
diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl
index 0125a55e9..7487841c8 100644
--- a/template/en/default/pages/fields.html.tmpl
+++ b/template/en/default/pages/fields.html.tmpl
@@ -213,10 +213,8 @@ as described below.
 
 <h2><a name="priority">Priority</a></h2>
 This field describes the importance and order in which [% terms.abug %]
-should be fixed. This field is utilized by the
-programmers/engineers to prioritize their work to be done. The
-available priorities range from <b>P1</b> (most important) to
-<b>P5</b> (least important).
+should be fixed compared to other [% terms.bugs %]. This field is utilized
+by the programmers/engineers to prioritize their work to be done.
 
 <h2><a name="bug_severity">Severity</a></h2>
 This field describes the impact of [% terms.abug %]. 
-- 
cgit v1.2.3-24-g4f1b