Bug 1641897 - Cleanup old severity values in custom forms and other places

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index e7dc76ff7c9f007351924874b54ce56d57b5ebd0..3d331ba0731f745efc85b2233c04820aa1797133 100644 (file)
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -93,8 +93,8 @@ use constant ISOLATION_LEVEL => 'REPEATABLE READ';
 use constant ENUM_DEFAULTS => {
   bug_type => ['defect', 'enhancement', 'task', '--'],
   bug_severity =>
-    ['blocker', 'critical', 'major', 'normal', 'minor', 'trivial'],
-  priority     => ["Highest", "High",    "Normal",    "Low",   "Lowest", "---"],
+    ['blocker', 'critical', 'major', 'normal', 'minor', 'trivial', '--'],
+  priority     => ["Highest", "High",    "Normal",    "Low",   "Lowest", "--"],
   op_sys       => ["All",     "Windows", "Mac OS",    "Linux", "Other"],
   rep_platform => ["All",     "PC",      "Macintosh", "Other"],
   bug_status =>

diff --git a/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl
index 483a2642bab270ee1c6e65942b50bbbf838fc8f5..54eecaea61f24c725bb574735de2f691fac2d53e 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl
@@ -88,7 +88,6 @@ function validateAndSubmit() {
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="token" value="[% token FILTER html %]">
   <input type="hidden" name="assigned_to" value="jgriffin@mozilla.com">
 

diff --git a/extensions/BMO/template/en/default/bug/create/create-blocklist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-blocklist.html.tmpl
index d8b9ba6e69683d78a963d9a367aa28312dfaded6..fcf9e61268b4dfa28fed5b8f64c74cd336120960 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-blocklist.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-blocklist.html.tmpl
@@ -138,10 +138,6 @@ window.addEventListener("DOMContentLoaded", function() {
   <input type="hidden" name="op_sys" value="All">
   <input type="hidden" name="bug_type" value="task">
   <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="priority" id="priority" value="--">
-  <input type="hidden" name="target_milestone" id="target_milestone" value="---">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="short_desc" id="short_desc" value="Extension block request">
   <input type="hidden" name="groups" value="blocklist-requests">
   <input type="hidden" name="comment" id="comment" value="It seems JavaScript is disabled. Please fill in the details again.">

diff --git a/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl
index 2fad6cf76f81158f8042fe49614757c6a1b6c308..6d26edcfa4f6f3f901a2e889463bb376c0848c47 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl
@@ -119,12 +119,8 @@ function validateAndSubmit() {
   <input type="hidden" name="op_sys" value="unspecified">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="priority" id="priority" value="--">
-  <input type="hidden" name="target_milestone" id="target_milestone" value="---">
   <input type="hidden" name="status_whiteboard" id="status_whiteboard"
          value="[reporter-external] [client-bounty-form] [verif?]">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="groups" value="firefox-core-security">
   <input type="hidden" name="flag_type-803" id="flag_type-803" value="?">
   <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl
index c0858d29fe748e3465f33796c2534969ac325cbb..ffcd854796cbcbb7ee6c6599a557de404f6ce919 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-comm-newsletter.html.tmpl
@@ -89,7 +89,6 @@ function toggleAreaOther() {
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="token" value="[% token FILTER html %]">
 
 <h1>Contributor Opportunity Submission</h1>

diff --git a/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl
index 7f6329614031464c429754d8cd93622f8978e9b2..10773d508fae896423bb627119aa39a7fe7c06f6 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl
@@ -150,9 +150,7 @@ YAHOO.util.Event.onDOMReady(function() {
   <input type="hidden" name="rep_platform" value="All">
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="priority" value="--">
   <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="short_desc" id="short_desc" value="">
   <input type="hidden" name="groups" value="mozilla-engagement">
   <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl
index b8e352afc205dea8297c03e9e62157265b5b4dd6..d7c9d6d64728858402d26cef9d5ce26ec6ea0de8 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl
@@ -123,7 +123,6 @@ function toggleTypeOther(element) {
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="cc" id="cc" value="">
   <input type="hidden" name="status_whiteboard" id="status_whiteboard" value="">
   <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/extensions/BMO/template/en/default/bug/create/create-crm.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-crm.html.tmpl
index c0e4bc944d32c80934f5d0bddf3c29eb8b5e7a2f..4d2ec8e934784a460093e3b109297cf497ce65f6 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-crm.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-crm.html.tmpl
@@ -93,8 +93,6 @@ $(document).ready(function() {
     <input type="hidden" name="op_sys" value="Other">
     <input type="hidden" name="version" value="unspecified">
     <input type="hidden" name="bug_type" value="task">
-    <input type="hidden" name="priority" value="--">
-    <input type="hidden" name="bug_severity" value="normal">
     <input type="hidden" name="format" value="crm">
     <input type="hidden" name="token" value="[% token FILTER html %]">
     [% IF user.in_group('canconfirm') %]

diff --git a/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl
index 812786ebb10777714132a2b8cdd395b9081b4723..6e42709ca2ba7cd6c672752d5e59d50f7c9a30c5 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl
@@ -82,7 +82,6 @@
 <input type="hidden" name="rep_platform" value="All">
 <input type="hidden" name="op_sys" value="All">
 <input type="hidden" name="bug_type" value="task">
-<input type="hidden" name="priority" value="--">
 <input type="hidden" name="version" value="unspecified">
 <input type="hidden" name="comment" id="comment" value="">
 <input type="hidden" name="status_whiteboard" id="status_whiteboard" value="">

diff --git a/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl
index 271df63147e5f0690fa7e37d66346626a7bd55be..250daec15868cc669fad9c90e4673bef991c232f 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl
@@ -83,9 +83,7 @@
 <input type="hidden" name="rep_platform" value="All">
 <input type="hidden" name="op_sys" value="Other">
 <input type="hidden" name="bug_type" value="task">
-<input type="hidden" name="priority" value="--">
 <input type="hidden" name="version" value="unspecified">
-<input type="hidden" name="bug_severity" id="bug_severity" value="normal">
 <input type="hidden" name="comment" id="comment" value="">
 <input type="hidden" name="groups" id="groups" value="finance">
 <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/extensions/BMO/template/en/default/bug/create/create-fsa-budget.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fsa-budget.html.tmpl
index c1a1862a99a78a4f6763c6d973299850500ab8fc..0d7ab4e9f1f0a97c7dbd703be6f3b08369e37929 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-fsa-budget.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-fsa-budget.html.tmpl
@@ -91,9 +91,7 @@ function validateAndSubmit() {
   <input type="hidden" name="rep_platform" value="All">
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="priority" value="--">
   <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="short_desc" id="short_desc" value="">
   <input type="hidden" name="cc" id="cc" value="">
   <input type="hidden" name="groups" value="mozilla-employee-confidential">

diff --git a/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl
index af0f2920c9d9c7730fe80d3433004e03da19b445..e718f4c17618dfce4597188c0c6b7b0d05be2ff0 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-intern.html.tmpl
@@ -115,8 +115,6 @@ $(document).ready(function() {
     <input type="hidden" name="op_sys" value="Other">
     <input type="hidden" name="version" value="unspecified">
     <input type="hidden" name="bug_type" value="task">
-    <input type="hidden" name="priority" value="--">
-    <input type="hidden" name="bug_severity" value="normal">
     <input type="hidden" name="format" value="intern">
     <input type="hidden" name="created-format" value="intern">
     <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl
index d0742d5400ead7cf5ef5f76cd335eaa074fb8513..dd2df8f1b3d2174b59a13ff383f08669c5ad43b5 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl
@@ -72,7 +72,6 @@ function validateAndSubmit() {
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="token" value="[% token FILTER html %]">
 
 <table id="ipp_form">

diff --git a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
index a40940856e8ebc51a01938b9bbe70655dd5516c3..ee9ee064a1c492c1bd437e68bb5eeb85f1031f7e 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl
@@ -98,33 +98,10 @@
   <input type="hidden" name="rep_platform" value="All">
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="priority" value="--">
   <input type="hidden" name="version" value="other">
   <input type="hidden" name="token" value="[% token FILTER html %]">
   <table>
     <tr>
-
-  <td align="right">
-    <strong>Urgency:</strong>
-  </td>
-
-  <td>
-    <select id="bug_severity" name="bug_severity" onchange="setsevdesc(this)">
-      <option value="blocker">All work for IT stops until this is done</option>
-      <option value="critical">IT should work on it soon as possible (urgent)</option>
-      <option value="major">IT should get to it within 24 hours</option>
-      <option value="normal">IT should get to it within the next week</option>
-      <option value="minor" selected="selected">No rush, but hopefully IT can get to it soon</option>
-      <option value="trivial">Whenever IT can get around to it</option>
-    </select>
-  </td>
-  <td>
-   <div id="blockerdesc" style="color:red;display:none">This will page the on-call sysadmin if not handled within 30 minutes.</div>
-   <div id="critdesc" style="color:red;display:none">This will page the on-call sysadmin if not handled within 8 hours.</div>
-  </td>
-
-    </tr>
-    <tr>
       <td style="white-space: nowrap; vertical-align: top" align="right"><strong>Request Type:</strong></td>
       <td style="white-space: nowrap; vertical-align: top">
         <input type="radio" name="component" id="component_service_desk" onclick="setcompdesc(this)" value="Desktop Issues">

diff --git a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
index d650089a6758fb5a2c9f8f5939ddac9679acb0db..d6b0fea448d7be4360e2900e7d0286762633a4cd 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl
@@ -82,8 +82,6 @@ label.required:before {
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="priority" value="--">
-  <input type="hidden" name="bug_severity" value="normal">
   <input type="hidden" name="format" value="legal">
   <input type="hidden" name="contenttypemethod" value="autodetect">
   <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl
index 4e7e1dcef9eb38594eefe021862e74ce3dbdf67e..9d1cb661cf32bb6e1a6f2ff99309b97a936108e9 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mdn.html.tmpl
@@ -185,7 +185,6 @@ strong.required:before {
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="bug_severity" value="normal">
   <input type="hidden" name="token" value="[% token FILTER html %]">
   <input type="hidden" name="status_whiteboard" id="status_whiteboard" value="">
 

diff --git a/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl
index e28579e5f002801454cbbfb077facb797ff42e86..1d32fe04e10ee37b9ecc2d5cd5ab1412ad657d4b 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl
@@ -85,7 +85,6 @@ function validateAndSubmit() {
   <input type="hidden" name="bug_status"   value="UNCONFIRMED">
   <input type="hidden" name="rep_platform" value="Other">
   <input type="hidden" name="bug_type"     value="defect">
-  <input type="hidden" name="bug_severity" value="normal">
   <input type="hidden" name="status_whiteboard" value="[mobile-compat-form]">
   <input type="hidden" name="user_agent"   value="[% cgi.user_agent() FILTER html %]">
 

diff --git a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
index 131bcf3ce4883dbaecf5143430da13c1fdbd12b7..9b6683503c0006d6c0c32b4cf3e446aac29b3e3d 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl
@@ -68,11 +68,9 @@
   <input type="hidden" id="rep_platform" name="rep_platform" value="All">
   <input type="hidden" id="op_sys" name="op_sys" value="Other">
   <input type="hidden" id="bug_type" name="bug_type" value="task">
-  <input type="hidden" id="priority" name="priority" value="--">
   <input type="hidden" id="version" name="version" value="other">
   <input type="hidden" id="short_desc" name="short_desc" value="">
   <input type="hidden" id="component" name="component" value="Discussion Forums">
-  <input type="hidden" id="bug_severity" name="bug_severity" value="normal">
   <input type="hidden" id="token" name="token" value="[% token FILTER html %]">
 
   <table>

diff --git a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
index 5cce042727b6088d01bd965effc70a0b05436d0e..594069a98e8b2950e2737d35d39a3dc6920bc580 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl
@@ -292,9 +292,7 @@ function validate_form() {
 <input type="hidden" name="op_sys" value="Other">
 <input type="hidden" name="version" value="unspecified">
 <input type="hidden" name="bug_type" value="task">
-<input type="hidden" name="bug_severity" value="normal">
 <input type="hidden" name="group" value="pr-private">
-<input type="hidden" name="assigned_to" id="assigned_to" value="nobody@mozilla.org">
 <input type="hidden" name="token" value="[% token FILTER html %]">
 
 <div class="head">

diff --git a/extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl
index 0c9431abfbad8c3a590f87a6b691ca324913a9e6..b779ec3f40e05cb720db88f5447d522e68c0444d 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-name-clearance.html.tmpl
@@ -80,8 +80,6 @@ $(function() {
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="priority" value="--">
-  <input type="hidden" name="bug_severity" value="normal">
   <input type="hidden" name="format" value="name-clearance">
   <input type="hidden" name="token" value="[% token FILTER html %]">
   [% IF user.in_group('canconfirm') %]

diff --git a/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl
index 5234473ec0f9bb3f4e630445e6193857cffceb28..a77f848c92301a137973dc0090f1212154bfb3f6 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl
@@ -71,8 +71,6 @@ $(function() {
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="priority" value="--">
-  <input type="hidden" name="bug_severity" value="normal">
   <input type="hidden" name="format" value="nda">
   <input type="hidden" name="token" value="[% token FILTER html %]">
   [% IF user.in_group('canconfirm') %]

diff --git a/extensions/BMO/template/en/default/bug/create/create-recoverykey.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-recoverykey.html.tmpl
index 4403102091989159fff6d4c6984ba8488bb536f5..65bb144030a9e66db49db0bbcf73f382a774c025 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-recoverykey.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-recoverykey.html.tmpl
@@ -39,10 +39,8 @@
   <input type="hidden" name="component" value="Server Operations: Desktop Issues">
   <input type="hidden" name="rep_platform" value="All">
   <input type="hidden" name="op_sys" value="All">
-  <input type="hidden" name="priority" value="--">
   <input type="hidden" name="version" value="other">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="bug_severity" value="normal">
   <input type="hidden" name="groups" value="mozilla-employee-confidential">
   <input type="hidden" name="groups" value="infra">
   <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl
index ea7877039c31d18bad2f1520a9a68a03e45d7f37..ab8cb018a181759cfb9436171e9177d50ac1ccf5 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl
@@ -79,8 +79,6 @@ function jobDescToggle(what) {
     <input type="hidden" name="op_sys" value="Other">
     <input type="hidden" name="version" value="unspecified">
     <input type="hidden" name="bug_type" value="task">
-    <input type="hidden" name="priority" value="--">
-    <input type="hidden" name="bug_severity" value="normal">
     <input type="hidden" name="format" value="recruiting">
     <input type="hidden" name="created-format" value="recruiting">
     <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/extensions/BMO/template/en/default/bug/create/create-screen-share-whitelist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-screen-share-whitelist.html.tmpl
index 4d610582045f006c0cf1ce981a67aef4e89e9293..7c3ce7ad50584afba7d27bfbbb5446f57c96b5f7 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-screen-share-whitelist.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-screen-share-whitelist.html.tmpl
@@ -98,8 +98,6 @@ function fieldValue(elem_id) {
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="Trunk">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="priority" value="--">
   <input type="hidden" name="short_desc" id="short_desc" value="">
   <input type="hidden" name="token" value="[% token FILTER html %]">
 

diff --git a/extensions/BMO/template/en/default/bug/create/create-shield-studies.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-shield-studies.html.tmpl
index 1c093e00d6bef99969b0990a86debed5a86b0967..856225482138a5a4fc43a1be439a5f06ecbe4a68 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-shield-studies.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-shield-studies.html.tmpl
@@ -50,7 +50,6 @@
 <input type="hidden" name="rep_platform" id="rep_platform" value="All">
 <input type="hidden" name="op_sys" id="op_sys" value="All">
 <input type="hidden" name="bug_type" value="task">
-<input type="hidden" name="priority" id="priority" value="--">
 <input type="hidden" name="version" id="version" value="unspecified">
 <input type="hidden" name="comment" id="comment" value="">
 <input type="hidden" name="status_whiteboard" id="status_whiteboard" value="">

diff --git a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
index fb948c120c381f938f7caaa0214afa790c07a133..d3f82933122971aa8b5895533012ca6a304206b6 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl
@@ -542,9 +542,7 @@ function showGear() {
   <input type="hidden" name="rep_platform" value="All">
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="priority" value="--">
   <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="short_desc" id="short_desc" value="">
   <input type="hidden" name="groups" value="mozilla-engagement">
   <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl
index 4ad8dc20b5672f8b92ca205d451a801bb3349be9..a616412732ab031f11893b603824a795753c581c 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl
@@ -44,7 +44,6 @@
         <input type="hidden" name="product" value="Marketing">
         <input type="hidden" name="component" value="Trademark Permissions">
         <input type="hidden" name="bug_type" value="task">
-        <input type="hidden" name="bug_severity" value="normal">
         <input type="hidden" name="rep_platform" value="All">
         <input type="hidden" name="priority" value="P3">
         <input type="hidden" name="op_sys" value="Other">

diff --git a/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl
index 343ec20e13137e7843a29ee37e9a9eaa73ef68e9..82cbee273c6f0e1c2ff694ea6b182befa8c52f40 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl
@@ -89,7 +89,6 @@ function toggleGoalOther() {
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="token" value="[% token FILTER html %]">
 
 <img title="User Engagement Form" src="[% basepath FILTER none %]extensions/BMO/web/images/user-engagement.png">

diff --git a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl
index 7f5a9c87c736f5947341912cd24107aac404ac04..09265fe0eff12ff930888094a2072cc0405e7bdf 100644 (file)
--- a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl
@@ -75,11 +75,7 @@ function validateAndSubmit() {
   <input type="hidden" name="op_sys" value="All">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="bug_type" value="task">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
-  <input type="hidden" name="priority" id="priority" value="--">
-  <input type="hidden" name="target_milestone" id="target_milestone" value="---">
   <input type="hidden" name="status_whiteboard" id="status_whiteboard" value="[reporter-external] [web-bounty-form] [verif?]">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="groups" id="group_52" value="websites-security">
   <input type="hidden" name="flag_type-803" id="flag_type-803" value="?">
   <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/extensions/BMO/template/en/default/hook/bug/field-help-end.none.tmpl b/extensions/BMO/template/en/default/hook/bug/field-help-end.none.tmpl
index 4b0df82fe62e970d07e077ff26ecafe38abfb86f..21131aa7bef27e7140e6f6145b3b5ed4a721a08c 100644 (file)
--- a/extensions/BMO/template/en/default/hook/bug/field-help-end.none.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/field-help-end.none.tmpl
@@ -48,30 +48,31 @@
       "This field describes the impact of ${terms.abug}.
        <table>
         <tr>
-          <th>blocker</th>
-          <td>Blocks development and/or testing work</td>
+          <th>S1</th>
+          <td>Blocks development/testing, may impact more than 25% of users,
+            causes data loss, potential chemspill, and no workaround available.
         </tr>
         <tr>
-          <th>critical</th>
-          <td>crashes, loss of data, severe memory leak</td>
+          <th>S2</th>
+          <td>Major functionality/product severely impaired and a satisfactory
+            workaround doesn't exist.</td>
         </tr>
         <tr>
-          <th>major</th>
-          <td>major loss of function</td>
+          <th>S3</th>
+          <td>Blocks non-critical functionality and a work around exists.</td>
         </tr>
         <tr>
-          <th>normal</th>
-          <td>regular issue, some loss of functionality under specific circumstances</td>
+          <th>S4</th>
+          <td>Minor significance, cosmetic issues, low or no impact to users.</td>
         </tr>
         <tr>
-          <th>minor</th>
-          <td>minor loss of function, or other problem where easy
-          workaround is present</td>
+          <th>N/A</th>
+          <td>The above definitions do not apply to this bug; this value is
+            reserved for bugs of type Task or Enhancement.</td>
         </tr>
         <tr>
-          <th>trivial</th>
-          <td>cosmetic problem like misspelled words or misaligned
-          text</td>
+          <th>--</th>
+          <td>No severity has been set yet.</td>
         </tr>
       </table>"
 

diff --git a/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl b/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl
index d707ef2245abb7d4dc81e228307d3d3a026fc70c..3c4b3f1250104424f035c3d650236fabdafd67c6 100644 (file)
--- a/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/get_permissions.html.tmpl
@@ -17,7 +17,7 @@
   the <a href="[% basepath FILTER none %]page.cgi?id=triage_request.html">triage request form</a>.
 </p>
 
-[% editbugs = basepath _ "enter_bug.cgi?assigned_to=nobody%40mozilla.org&bug_file_loc=http%3A%2F%2F&bug_ignored=0&bug_type=task&bug_severity=normal&bug_status=NEW&cf_fx_iteration=---&cf_fx_points=---&component=Editbugs%20Requests&contenttypemethod=autodetect&contenttypeselection=text%2Fplain&defined_groups=1&flag_type-4=X&flag_type-607=X&flag_type-791=X&flag_type-800=X&flag_type-803=X&flag_type-916=X&form_name=enter_bug&maketemplate=Remember%20values%20as%20bookmarkable%20template&op_sys=Unspecified&priority=--&product=bugzilla.mozilla.org&rep_platform=Unspecified&target_milestone=---&version=Production" %]
+[% editbugs = basepath _ "enter_bug.cgi?assigned_to=nobody%40mozilla.org&bug_file_loc=http%3A%2F%2F&bug_ignored=0&bug_type=task&bug_severity=--&bug_status=NEW&cf_fx_iteration=---&cf_fx_points=---&component=Editbugs%20Requests&contenttypemethod=autodetect&contenttypeselection=text%2Fplain&defined_groups=1&flag_type-4=X&flag_type-607=X&flag_type-791=X&flag_type-800=X&flag_type-803=X&flag_type-916=X&form_name=enter_bug&maketemplate=Remember%20values%20as%20bookmarkable%20template&op_sys=Unspecified&priority=--&product=bugzilla.mozilla.org&rep_platform=Unspecified&target_milestone=---&version=Production" %]
 
 <p>
   If you want <kbd>editbugs</kbd>, open a

diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
index 4fa587b3677408d9b07a772e7361327c133365ff..d202a3c780533019677d2e393297df0a4c944fd7 100644 (file)
--- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
@@ -329,9 +329,7 @@ Product: <b><span id="dupes_product_name">?</span></b>:
 <input type="hidden" name="token" value="[% token FILTER html %]">
 <input type="hidden" name="product" id="product" value="">
 <input type="hidden" name="component" id="component" value="">
-<input type="hidden" name="bug_severity" value="--">
 <input type="hidden" name="rep_platform" id="rep_platform" value="All">
-<input type="hidden" name="priority" value="--">
 <input type="hidden" name="op_sys" id="op_sys" value="All">
 <input type="hidden" name="version" id="version" value="">
 <input type="hidden" name="comment" id="comment" value="">

diff --git a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
index d9e280d203b63527c60cf24defee0648fec02f8c..5438952851c6f00ff6e464369cb389c635fd45f5 100644 (file)
--- a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
+++ b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
@@ -54,10 +54,8 @@
   <input type="hidden" id="component" name="component" value="General">
   <input type="hidden" id="rep_platform" name="rep_platform" value="All">
   <input type="hidden" id="op_sys" name="op_sys" value="All">
-  <input type="hidden" id="priority" name="priority" value="--">
   <input type="hidden" id="version" name="version" value="unspecified">
   <input type="hidden" id="format" name="format" value="moz-project-review">
-  <input type="hidden" id="bug_severity" name="bug_severity" value="normal">
   <input type="hidden" id="groups" name="groups" value="mozilla-employee-confidential">
   <input type="hidden" id="short_desc" name="short_desc" value="">
   <input type="hidden" id="token" name="token" value="[% token FILTER html %]">

diff --git a/extensions/REMO/template/en/default/bug/create/create-csa-discourse.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-csa-discourse.html.tmpl
index bba79e5db76f88f1bb7c23d07f36083f0702904e..41b4e12c24e672215befdfb5ff4787e94568e0eb 100644 (file)
--- a/extensions/REMO/template/en/default/bug/create/create-csa-discourse.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-csa-discourse.html.tmpl
@@ -27,9 +27,7 @@
   <input type="hidden" name="bug_type" value="task">
   <input type="hidden" name="product" value="Infrastructure & Operations">
   <input type="hidden" name="component" value="Community IT: Discourse">
-  <input type="hidden" name="bug_severity" value="normal">
   <input type="hidden" name="rep_platform" value="All">
-  <input type="hidden" name="priority" value="--">
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="other">
   <input type="hidden" name="format" value="[% format FILTER html %]">

diff --git a/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl
index f9f341d089e25383d57a95e211aa455166c83667..db8c835f2a894789efe29ca8857c6597e3537cba 100644 (file)
--- a/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-mozreps.html.tmpl
@@ -43,9 +43,7 @@
   <input type="hidden" name="bug_type" value="task">
   <input type="hidden" name="product" value="Mozilla Reps">
   <input type="hidden" name="component" value="Mentorship">
-  <input type="hidden" name="bug_severity" value="normal">
   <input type="hidden" name="rep_platform" value="All">
-  <input type="hidden" name="priority" value="--">
   <input type="hidden" name="op_sys" value="Other">
   <input type="hidden" name="version" value="unspecified">
   <input type="hidden" name="groups" value="mozilla-reps">

diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
index 2f049ca8d5c1b4e9102b1e39d666db72631933c6..567db0108ee7c3a382f46cd0a5568796db19995c 100644 (file)
--- a/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl
@@ -85,9 +85,7 @@ function validateAndSubmit() {
   <input type="hidden" name="component" value="Budget Requests">
   <input type="hidden" name="rep_platform" value="All">
   <input type="hidden" name="op_sys" value="Other">
-  <input type="hidden" name="priority" value="--">
   <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="short_desc" id="short_desc" value="">
   <input type="hidden" name="cc" id="cc" value="">
   <input type="hidden" name="groups" value="mozilla-reps">

diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
index 944e6916fd0122e734370ed0de1eca3bc2d88496..2a6d7aef8a397e56a338c35bdfde11d94b9b9e05 100644 (file)
--- a/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
+++ b/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl
@@ -77,9 +77,7 @@ function validateAndSubmit() {
   <input type="hidden" name="component" value="Swag Requests">
   <input type="hidden" name="rep_platform" value="All">
   <input type="hidden" name="op_sys" value="Other">
-  <input type="hidden" name="priority" value="--">
   <input type="hidden" name="version" value="unspecified">
-  <input type="hidden" name="bug_severity" id="bug_severity" value="normal">
   <input type="hidden" name="short_desc" id="short_desc" value="">
   <input type="hidden" name="groups" value="mozilla-reps">
   <input type="hidden" name="token" value="[% token FILTER html %]">

diff --git a/qa/config/generate_test_data.pl b/qa/config/generate_test_data.pl
index ca43c41404624aaababe1dcc1ab100528c8c3841..4ac74c2482b5b72159366d4d580559c2302c3389 100644 (file)
--- a/qa/config/generate_test_data.pl
+++ b/qa/config/generate_test_data.pl
@@ -90,6 +90,7 @@ my %set_params = (
   mail_delivery_method       => 'Test',
   maxattachmentsize          => 256,
   defaultpriority            => 'Highest',     # BMO CHANGE
+  defaultseverity            => '--',          # BMO CHANGE
   timetrackinggroup          => 'editbugs',    # BMO CHANGE
   letsubmitterchoosepriority => 1,             # BMO CHANGE
   createemailregexp          => '.*',          # BMO CHANGE
@@ -368,7 +369,7 @@ my %field_values = (
   'short_desc'   => 'This is a testing bug only',
   'product'      => 'TestProduct',
   'op_sys'       => 'Linux',
-  'bug_severity' => 'normal',
+  'bug_severity' => '--',
   'groups'       => [],
 );