Bug 281574 : Combine version_/milestone_/component_no_action errors into one.

Patch by Shane H. W. Travis <travis@sedsystems.ca>   r=LpSolit  a=myk

diff --git a/editcomponents.cgi b/editcomponents.cgi
index 7c1ac96caa97da55b73fcbf72f57627851b17cef..f1d20fbd5cc5163017f534eaaa3ea2303c12d49b 100755 (executable)
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -671,4 +671,4 @@ if ($action eq 'update') {
 #
 # No valid action found
 #
-ThrowUserError('component_no_action');
+ThrowUserError('no_valid_action', {'field' => "component"});

diff --git a/editmilestones.cgi b/editmilestones.cgi
index 6d47fc6af414f419ff33737dce9498a33b348959..4da12184880e340d1d997819a685ff7d5b157588 100755 (executable)
--- a/editmilestones.cgi
+++ b/editmilestones.cgi
@@ -594,4 +594,4 @@ if ($action eq 'update') {
 #
 # No valid action found
 #
-ThrowUserError('milestone_no_action');
+ThrowUserError('no_valid_action', {'field' => "target_milestone"});

diff --git a/editversions.cgi b/editversions.cgi
index 2173470dc3637c7049a71fb7c573573aabdfe1b2..222e7dd8e0b7c389a83efd66239f02e02e8a4387 100755 (executable)
--- a/editversions.cgi
+++ b/editversions.cgi
@@ -446,4 +446,4 @@ if ($action eq 'update') {
 #
 # No valid action found
 #
-ThrowUserError('version_no_action');
+ThrowUserError('no_valid_action', {'field' => "version"});

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 5c293bd2be5556b5d1bd97157a6f3d87de572ca0..b47f25a8fb7a6943dc56f1919c29ee03d1718bd0 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -258,10 +258,6 @@
     You must use an existing [% terms.Bugzilla %] account as initial QA contact for
     component '[% name FILTER html %]'.
      
-  [% ELSIF error == "component_no_action" %]
-    [% title = "No valid action specified" %]
-    No valid action was specified when trying to edit components.
-
   [% ELSIF error == "product_not_specified" %]
     [% title = "No Product Specified" %]
     No product specified when trying to edit components, milestones or
@@ -629,10 +625,6 @@
     The name of a milestone is limited to 20 characters. 
     '[% name FILTER html %]' is too long ([% name.length %] characters).
 
-  [% ELSIF error == "milestone_no_action" %]
-    [% title = "No valid action specified" %]
-    No valid action was specified when trying to edit milestones.
-
   [% ELSIF error == "milestone_not_specified" %]
     [% title = "No Milestone Specified" %]
     No milestone specified when trying to edit milestones.
@@ -796,6 +788,10 @@
     Either no products have been defined to enter [% terms.bugs %] against or you have not
     been given access to any.
 
+  [% ELSIF error == "no_valid_action" %]
+    [% title = "No valid action specified" %]
+    Cannot edit [% field_descs.$field FILTER html %]: no valid action was specified.
+
   [% ELSIF error == "number_not_numeric" %]
     [% title = "Numeric Value Required" %]
     The value '[% num FILTER html %]' in the 
@@ -985,10 +981,6 @@
     The name of a version is limited to 20 characters. 
     '[% name FILTER html %]' is too long ([% name.length %] characters).
 
-  [% ELSIF error == "version_no_action" %]
-    [% title = "No valid action specified" %]
-    No valid action was specified when trying to edit versions.
-
   [% ELSIF error == "version_not_specified" %]
     [% title = "No Version Specified" %]
     No version specified when trying to edit versions.