From: dklawren Date: Fri, 29 May 2020 21:40:12 +0000 (-0400) Subject: Bug 1641897 - Cleanup old severity values in custom forms and other places X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=065448ae29ecf69bd57249994788185de8811db8;p=thirdparty%2Fbugzilla.git Bug 1641897 - Cleanup old severity values in custom forms and other places --- diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm index e7dc76ff7..3d331ba07 100644 --- 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 483a2642b..54eecaea6 100644 --- 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() { - 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 d8b9ba6e6..fcf9e6126 100644 --- 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() { - - - - 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 2fad6cf76..6d26edcfa 100644 --- 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() { - - - - 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 c0858d29f..ffcd85479 100644 --- 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() { -

Contributor Opportunity Submission

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 7f6329614..10773d508 100644 --- 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() { - - 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 b8e352afc..d7c9d6d64 100644 --- 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) { - 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 c0e4bc944..4d2ec8e93 100644 --- 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() { - - [% 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 812786ebb..6e42709ca 100644 --- 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 @@ - 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 271df6314..250daec15 100644 --- 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 @@ - - 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 c1a1862a9..0d7ab4e9f 100644 --- 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() { - - 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 af0f2920c..e718f4c17 100644 --- 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() { - - 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 d0742d540..dd2df8f1b 100644 --- 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() { - 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 a40940856..ee9ee064a 100644 --- 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 @@ -
- - - - - - - -
- Urgency: - - - - - -
Request Type: 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 d650089a6..d6b0fea44 100644 --- 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 { - - 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 4e7e1dcef..9d1cb661c 100644 --- 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 { - 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 e28579e5f..1d32fe04e 100644 --- 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() { - 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 131bcf3ce..9b6683503 100644 --- 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 @@ - - 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 5cce04272..594069a98 100644 --- 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() { - -
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 0c9431abf..b779ec3f4 100644 --- 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() { - - [% 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 5234473ec..a77f848c9 100644 --- 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() { - - [% 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 440310209..65bb14403 100644 --- 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 @@ - - 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 ea7877039..ab8cb018a 100644 --- 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) { - - 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 4d6105820..7c3ce7ad5 100644 --- 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) { - - 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 1c093e00d..856225482 100644 --- 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 @@ - 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 fb948c120..d3f829331 100644 --- 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() { - - 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 4ad8dc20b..a61641273 100644 --- 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 @@ - 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 343ec20e1..82cbee273 100644 --- 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() { - 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 7f5a9c87c..09265fe0e 100644 --- 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() { - - - - 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 4b0df82fe..21131aa7b 100644 --- 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}.
- - + + - - + + - - + + - - + + - - + + - - + +
blockerBlocks development and/or testing workS1Blocks development/testing, may impact more than 25% of users, + causes data loss, potential chemspill, and no workaround available.
criticalcrashes, loss of data, severe memory leakS2Major functionality/product severely impaired and a satisfactory + workaround doesn't exist.
majormajor loss of functionS3Blocks non-critical functionality and a work around exists.
normalregular issue, some loss of functionality under specific circumstancesS4Minor significance, cosmetic issues, low or no impact to users.
minorminor loss of function, or other problem where easy - workaround is presentN/AThe above definitions do not apply to this bug; this value is + reserved for bugs of type Task or Enhancement.
trivialcosmetic problem like misspelled words or misaligned - text--No severity has been set yet.
" 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 d707ef224..3c4b3f125 100644 --- 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 triage request form.

-[% 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" %]

If you want editbugs, 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 4fa587b36..d202a3c78 100644 --- 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: ?: - - 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 d9e280d20..543895285 100644 --- 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 @@ - - 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 bba79e5db..41b4e12c2 100644 --- 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 @@ - - 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 f9f341d08..db8c835f2 100644 --- 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 @@ - - 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 2f049ca8d..567db0108 100644 --- 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() { - - 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 944e6916f..2a6d7aef8 100644 --- 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() { - - diff --git a/qa/config/generate_test_data.pl b/qa/config/generate_test_data.pl index ca43c4140..4ac74c248 100644 --- 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' => [], );