Commit ab439a9a authored by timeless%mozdev.org's avatar timeless%mozdev.org

Bug 221827 Missing Bug ID shouldn't be handled as Invalid Bug ID

r=vladd a=mkanat
parent 938fdbf5
...@@ -2797,7 +2797,7 @@ sub ValidateBugID { ...@@ -2797,7 +2797,7 @@ sub ValidateBugID {
my $alias = $id; my $alias = $id;
if (!detaint_natural($id)) { if (!detaint_natural($id)) {
$id = bug_alias_to_id($alias); $id = bug_alias_to_id($alias);
$id || ThrowUserError("invalid_bug_id_or_alias", $id || ThrowUserError("improper_bug_id_field_value",
{'bug_id' => $alias, {'bug_id' => $alias,
'field' => $field }); 'field' => $field });
} }
...@@ -2808,7 +2808,7 @@ sub ValidateBugID { ...@@ -2808,7 +2808,7 @@ sub ValidateBugID {
# First check that the bug exists # First check that the bug exists
$dbh->selectrow_array("SELECT bug_id FROM bugs WHERE bug_id = ?", undef, $id) $dbh->selectrow_array("SELECT bug_id FROM bugs WHERE bug_id = ?", undef, $id)
|| ThrowUserError("invalid_bug_id_non_existent", {'bug_id' => $id}); || ThrowUserError("bug_id_does_not_exist", {'bug_id' => $id});
return if (defined $field && ($field eq "dependson" || $field eq "blocked")); return if (defined $field && ($field eq "dependson" || $field eq "blocked"));
......
...@@ -51,8 +51,8 @@ use base qw(Exporter); ...@@ -51,8 +51,8 @@ use base qw(Exporter);
# have to fix it here. # have to fix it here.
use constant WS_ERROR_CODE => { use constant WS_ERROR_CODE => {
# Bug errors usually occupy the 100-200 range. # Bug errors usually occupy the 100-200 range.
invalid_bug_id_or_alias => 100, improper_bug_id_field_value => 100,
invalid_bug_id_non_existent => 101, bug_id_does_not_exist => 101,
bug_access_denied => 102, bug_access_denied => 102,
invalid_field_name => 108, invalid_field_name => 108,
# These all mean "invalid alias" # These all mean "invalid alias"
......
...@@ -49,7 +49,7 @@ my $dbh = Bugzilla->switch_to_shadow_db(); ...@@ -49,7 +49,7 @@ my $dbh = Bugzilla->switch_to_shadow_db();
# Make sure the bug ID is a positive integer representing an existing # Make sure the bug ID is a positive integer representing an existing
# bug that the user is authorized to access. # bug that the user is authorized to access.
my $id = $cgi->param('id') || ThrowUserError('invalid_bug_id_or_alias'); my $id = $cgi->param('id') || ThrowUserError('improper_bug_id_field_value');
ValidateBugID($id); ValidateBugID($id);
my $current_bug = new Bugzilla::Bug($id); my $current_bug = new Bugzilla::Bug($id);
......
...@@ -746,12 +746,14 @@ ...@@ -746,12 +746,14 @@
[% title = "Invalid Attachment ID" %] [% title = "Invalid Attachment ID" %]
The attachment id [% attach_id FILTER html %] is invalid. The attachment id [% attach_id FILTER html %] is invalid.
[% ELSIF error == "invalid_bug_id_non_existent" %] [% ELSIF error == "bug_id_does_not_exist" %]
[% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %] [% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %]
[% terms.Bug %] #[% bug_id FILTER html %] does not exist. [% terms.Bug %] #[% bug_id FILTER html %] does not exist.
[% ELSIF error == "invalid_bug_id_or_alias" %] [% ELSIF error == "improper_bug_id_field_value" %]
[% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %] [% title = BLOCK %]
[% IF bug_id %]Invalid [% ELSE %]Missing [% END %] [% terms.Bug %] ID
[% END %]
[% IF bug_id %] [% IF bug_id %]
'[% bug_id FILTER html %]' is not a valid [% terms.bug %] number '[% bug_id FILTER html %]' is not a valid [% terms.bug %] number
[% IF Param("usebugaliases") %] [% IF Param("usebugaliases") %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment