Merge remote-tracking branch 'dylanwh/bmo-workflow-default' into unstable

3 files changed, 9 insertions, 9 deletions

diff --git a/Bugzilla/Config/BugFields.pm b/Bugzilla/Config/BugFields.pm
index 94a16b7c2..c443ffe78 100644
--- a/Bugzilla/Config/BugFields.pm
+++ b/Bugzilla/Config/BugFields.pm
@@ -65,7 +65,7 @@ sub get_param_list {
             name    => 'defaultpriority',
             type    => 's',
             choices => \@legal_priorities,
-            default => $legal_priorities[-1],
+            default => $legal_priorities[0],
             checker => \&check_priority
         },
 
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index ff75aa2cf..a2cff0bd4 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -49,14 +49,12 @@ use constant ISOLATION_LEVEL => 'REPEATABLE READ';
 # Bugzilla with enums. After that, they are either controlled through
 # the Bugzilla UI or through the DB.
 use constant ENUM_DEFAULTS => {
-    bug_severity  => ['blocker', 'critical', 'major', 'normal',
-                      'minor', 'trivial', 'enhancement'],
-    priority     => ["Highest", "High", "Normal", "Low", "Lowest", "---"],
-    op_sys       => ["All","Windows","Mac OS","Linux","Other"],
-    rep_platform => ["All","PC","Macintosh","Other"],
-    bug_status   => ["UNCONFIRMED","CONFIRMED","IN_PROGRESS","RESOLVED",
-                     "VERIFIED"],
-    resolution   => ["","FIXED","INVALID","WONTFIX", "DUPLICATE","WORKSFORME"],
+    bug_severity => [qw(blocker critical major normal minor  trivial enhancement  )],
+    priority     => [qw(-- P1 P2 P3 P4 P5)],
+    op_sys       => [ "Unspecified", "All", "Windows", "Mac OS", "Linux", "Other" ],
+    rep_platform => [ "Unspecified", "All", "PC", "Macintosh", "Other" ],
+    bug_status   => [qw(UNCONFIRMED NEW ASSIGNED REOPENED RESOLVED VERIFIED CLOSED)],
+    resolution   => [ "", qw(FIXED INVALID WONTFIX DUPLICATE WORKSFORME INCOMPLETE) ],
 };
 
 # The character that means "OR" in a boolean fulltext search. If empty,
diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index d004ac6ba..6ac16821e 100644
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -19,6 +19,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
+use Bugzilla::Logging;
 use Bugzilla::Component;
 use Bugzilla::Config qw(:admin);
 use Bugzilla::Constants;
@@ -398,6 +399,7 @@ sub init_workflow {
         'SELECT value, id FROM bug_status', {Columns=>[1,2]}) };
 
     foreach my $pair (STATUS_WORKFLOW) {
+        WARN("unknown bug_status: " . $pair->[1]) unless $status_ids{$pair->[1]};
         my $old_id = $pair->[0] ? $status_ids{$pair->[0]} : undef;
         my $new_id = $status_ids{$pair->[1]};
         $dbh->do('INSERT INTO status_workflow (old_status, new_status)