From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sun, 28 Mar 2010 21:22:55 +0000 (-0700)
Subject: Bug 553913: Add explicit error codes to WebService errors that were missing
X-Git-Tag: bugzilla-3.6~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b904cb2d04ed916d4d0b3f1f29b911d11ca3e64a;p=thirdparty%2Fbugzilla.git

Bug 553913: Add explicit error codes to WebService errors that were missing
them
r=dkl, a=mkanat
---

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index ef4ec014f0..abae154af6 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -1916,6 +1916,11 @@ A hash with one element, C<id> whose value is the id of the newly-created commen
 
 =over
 
+=item 54 (Hours Worked Too Large)
+
+You specified a C<work_time> larger than the maximum allowed value of
+C<99999.99>.
+
 =item 100 (Invalid Bug Alias) 
 
 If you specified an alias and either: (a) the Bugzilla you're querying
@@ -1933,6 +1938,11 @@ You did not have the necessary rights to edit the bug.
 
 You tried to add a private comment, but don't have the necessary rights.
 
+=item 114 (Comment Too Long)
+
+You tried to add a comment longer than the maximum allowed length
+(65,535 characters).
+
 =back
 
 =item B<History>
@@ -1950,6 +1960,9 @@ but can't, in Bugzilla B<3.4>.
 C<private>, and you can still call it C<private> for backwards-compatibility
 purposes if you wish.
 
+=item Before Bugzilla B<3.6>, error 54 and error 114 had a generic error
+code of 32000.
+
 =back
 
 =back
@@ -2048,6 +2061,11 @@ You did not have the necessary rights to edit the bug.
 
 One of the URLs you provided did not look like a valid bug URL.
 
+=item 115 (See Also Edit Denied)
+
+You did not have the necessary rights to edit the See Also field for
+this bug.
+
 =back
 
 =item B<History>
@@ -2056,6 +2074,8 @@ One of the URLs you provided did not look like a valid bug URL.
 
 =item Added in Bugzilla B<3.4>.
 
+=item Before Bugzilla B<3.6>, error 115 had a generic error code of 32000.
+
 =back
 
 =back
diff --git a/Bugzilla/WebService/Constants.pm b/Bugzilla/WebService/Constants.pm
index c7c52fecef..19d2307590 100644
--- a/Bugzilla/WebService/Constants.pm
+++ b/Bugzilla/WebService/Constants.pm
@@ -53,8 +53,9 @@ use constant WS_ERROR_CODE => {
     params_required             => 50,
     object_does_not_exist       => 51,
     param_must_be_numeric       => 52,
-    xmlrpc_invalid_value        => 52,
+    number_not_numeric          => 52,
     param_invalid               => 53,
+    number_too_large            => 54,
     # Bug errors usually occupy the 100-200 range.
     improper_bug_id_field_value => 100,
     bug_id_does_not_exist       => 101,
@@ -85,11 +86,15 @@ use constant WS_ERROR_CODE => {
     # Comment-related errors
     comment_is_private => 110,
     comment_id_invalid => 111,
+    comment_too_long => 114,
     # See Also errors
     bug_url_invalid => 112,
     bug_url_too_long => 112,
     # Insidergroup Errors
     user_not_insider => 113,
+    # Note: 114 is above in the Comment-related section.
+    # Bug update errors
+    illegal_change => 115,
 
     # Authentication errors are usually 300-400.
     invalid_username_or_password => 300,
@@ -114,7 +119,10 @@ use constant WS_ERROR_CODE => {
     invalid_user_group    => 504,
     user_access_by_id_denied    => 505,
     user_access_by_match_denied => 505,
-    # Fatal errors (must be negative).
+
+    # RPC Server Errors. See the following URL:
+    # http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
+    xmlrpc_invalid_value        => -32600,
     unknown_method              => -32601,
 };
 
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index d5106abebd..a507416364 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -297,7 +297,8 @@
 
   [% ELSIF error == "comment_too_long" %]
     [% title = "Comment Too Long" %]
-    Comments cannot be longer than 65,535 characters.
+    Comments cannot be longer than 
+    [%+ constants.MAX_COMMENT_LENGTH FILTER html %] characters.
 
   [% ELSIF error == "auth_classification_not_enabled" %]
     [% title = "Classification Not Enabled" %]