Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
r=vladd a=mkanat


git-svn-id: svn://10.0.0.236/trunk@233013 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2007-08-24 05:15:18 +00:00
parent d3ff5d698f
commit cda4f54d42
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/webtools/bugzilla/Bugzilla/Bug.pm
View File

@@ -2797,7 +2797,7 @@ sub ValidateBugID {
my $alias = $id;
if (!detaint_natural($id)) {
$id = bug_alias_to_id($alias);
$id || ThrowUserError("invalid_bug_id_or_alias",
$id || ThrowUserError("improper_bug_id_field_value",
{'bug_id' => $alias,
'field' => $field });
}
@@ -2808,7 +2808,7 @@ sub ValidateBugID {
# First check that the bug exists
$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"));

4
mozilla/webtools/bugzilla/Bugzilla/WebService/Constants.pm
View File

@@ -51,8 +51,8 @@ use base qw(Exporter);
# have to fix it here.
use constant WS_ERROR_CODE => {
# Bug errors usually occupy the 100-200 range.
invalid_bug_id_or_alias => 100,
invalid_bug_id_non_existent => 101,
improper_bug_id_field_value => 100,
bug_id_does_not_exist => 101,
bug_access_denied => 102,
invalid_field_name => 108,
# These all mean "invalid alias"

2
mozilla/webtools/bugzilla/showdependencytree.cgi
View File

@@ -49,7 +49,7 @@ my $dbh = Bugzilla->switch_to_shadow_db();
# Make sure the bug ID is a positive integer representing an existing
# 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);
my $current_bug = new Bugzilla::Bug($id);

8
mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
View File

@@ -746,12 +746,14 @@
[% title = "Invalid Attachment ID" %]
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 %]
[% terms.Bug %] #[% bug_id FILTER html %] does not exist.
[% ELSIF error == "invalid_bug_id_or_alias" %]
[% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %]
[% ELSIF error == "improper_bug_id_field_value" %]
[% title = BLOCK %]
[% IF bug_id %]Invalid [% ELSE %]Missing [% END %] [% terms.Bug %] ID
[% END %]
[% IF bug_id %]
'[% bug_id FILTER html %]' is not a valid [% terms.bug %] number
[% IF Param("usebugaliases") %]