From 32c44a8de8c03f3e637b38c9c63f713c5a54da56 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Sun, 26 Aug 2018 02:12:12 -0400
Subject: Revert "make the default workflow the same as bmo"

This reverts commit e4bd13639d5c5f436628e2aa766dca75328627c0.
---
 Bugzilla/Config/BugFields.pm |  2 +-
 Bugzilla/DB.pm               | 14 ++++++++------
 Bugzilla/Install.pm          |  2 --
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Bugzilla/Config/BugFields.pm b/Bugzilla/Config/BugFields.pm
index c443ffe78..94a16b7c2 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[0],
+            default => $legal_priorities[-1],
             checker => \&check_priority
         },
 
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index f07bb7183..80404131a 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -61,12 +61,14 @@ 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 => [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) ],
+    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"],
 };
 
 # The character that means "OR" in a boolean fulltext search. If empty,
diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index 14fe904eb..c9935f34d 100644
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -19,7 +19,6 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use Bugzilla::Logging;
 use Bugzilla::Component;
 use Bugzilla::Config qw(:admin);
 use Bugzilla::Constants;
@@ -396,7 +395,6 @@ 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)
-- 
cgit v1.2.3-24-g4f1b