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

Bug 565879: Merge ThrowCodeError("action_unrecognized"), ThrowUserError("no_valid_action") and ThrowCodeError("unknown_action")

Browse Source 
r=ghendricks a=LpSolit


git-svn-id: svn://10.0.0.236/trunk@260347 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org 2010-05-20 15:46:29 +00:00
parent f90a541daf
commit ecf0f13ce8
22 changed files with 29 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
7187
7188

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

@ -127,7 +127,7 @@ elsif ($action eq "delete") {
}
else
{
ThrowCodeError("unknown_action", { action => $action });
ThrowUserError('unknown_action', {action => $action});
}
exit;

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

@ -511,7 +511,7 @@ elsif (($cmdtype eq "doit") && defined $cgi->param('remtype')) {
# We add or remove bugs based on the action choosen.
my $action = trim($cgi->param('action') || '');
$action =~ /^(add|remove)$/
|| ThrowCodeError('unknown_action', {'action' => $action});
|| ThrowUserError('unknown_action', {action => $action});
# If we are removing bugs, then we must have an existing
# saved search selected.

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

@ -227,7 +227,7 @@ elsif ($action eq "convert_search") {
print $cgi->redirect(-location => correct_urlbase() . "query.cgi?format=create-series$url");
}
else {
ThrowCodeError("unknown_action");
ThrowUserError('unknown_action', {action => $action});
}
exit;

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

@ -233,4 +233,4 @@ if ($action eq 'reclassify') {
# No valid action found
#
ThrowCodeError("action_unrecognized", {action => $action});
ThrowUserError('unknown_action', {action => $action});

4
mozilla/webtools/bugzilla/editcomponents.cgi
View File

@ -252,7 +252,5 @@ if ($action eq 'update') {
exit;
}
#
# No valid action found
#
ThrowUserError('no_valid_action', {'field' => "component"});
ThrowUserError('unknown_action', {action => $action});

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

@ -171,5 +171,5 @@ elsif ($action eq 'delete') {
|| ThrowTemplateError($template->error());
}
else {
ThrowUserError('no_valid_action', {'field' => 'custom_field'});
ThrowUserError('unknown_action', {action => $action});
}

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

@ -86,7 +86,7 @@ elsif ($action eq 'confirmdelete') { confirmDelete(); }
elsif ($action eq 'delete') { deleteType($token); }
elsif ($action eq 'deactivate') { deactivate($token); }
else {
ThrowCodeError("action_unrecognized", { action => $action });
ThrowUserError('unknown_action', {action => $action});
}
exit;

7
mozilla/webtools/bugzilla/editgroups.cgi
View File

@ -357,13 +357,8 @@ if ($action eq 'remove_regexp') {
exit;
}
#
# No valid action found
#
ThrowCodeError("action_unrecognized", $vars);
ThrowUserError('unknown_action', {action => $action});
# Helper sub to handle the making of changes to a group
sub doGroupChanges {

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

@ -183,4 +183,4 @@ if ($action eq 'delete') {
exit;
}
ThrowCodeError("action_unrecognized", $vars);
ThrowUserError('unknown_action', {action => $action});

4
mozilla/webtools/bugzilla/editmilestones.cgi
View File

@ -218,7 +218,5 @@ if ($action eq 'update') {
exit;
}
#
# No valid action found
#
ThrowUserError('no_valid_action', {'field' => "target_milestone"});
ThrowUserError('unknown_action', {action => $action});

5
mozilla/webtools/bugzilla/editproducts.cgi
View File

@ -422,8 +422,5 @@ if ($action eq 'updategroupcontrols') {
exit;
}
#
# No valid action found
#
ThrowUserError('no_valid_action', {field => "product"});
ThrowUserError('unknown_action', {action => $action});

3
mozilla/webtools/bugzilla/editusers.cgi
View File

@ -675,8 +675,7 @@ if ($action eq 'search') {
###########################################################################
} else {
$vars->{'action'} = $action;
ThrowCodeError('action_unrecognized', $vars);
ThrowUserError('unknown_action', {action => $action});
}
exit;

7
mozilla/webtools/bugzilla/editvalues.cgi
View File

@ -193,10 +193,5 @@ if ($action eq 'update') {
display_field_values($vars);
}
#
# No valid action found
#
# We can't get here without $field being defined --
# See the unless($field) block at the top.
ThrowUserError('no_valid_action', { field => $field } );
ThrowUserError('unknown_action', {action => $action});

4
mozilla/webtools/bugzilla/editversions.cgi
View File

@ -219,7 +219,5 @@ if ($action eq 'update') {
exit;
}
#
# No valid action found
#
ThrowUserError('no_valid_action', {'field' => "version"});
ThrowUserError('unknown_action', {action => $action});

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

@ -147,5 +147,5 @@ elsif ($action eq 'update_comment') {
load_template('comment', 'workflow_updated');
}
else {
ThrowCodeError("action_unrecognized", {action => $action});
ThrowUserError('unknown_action', {action => $action});
}

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

@ -190,7 +190,7 @@ elsif ($action eq 'end-sudo') {
# No valid action found
else {
Bugzilla->login(LOGIN_OPTIONAL);
ThrowCodeError('unknown_action', {action => $action});
ThrowUserError('unknown_action', {action => $action});
}
# Display the template

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

@ -289,7 +289,7 @@ elsif ($action eq "plot") {
$vars->{'data'} = \@image_data;
}
else {
ThrowCodeError("unknown_action", {action => $cgi->param('action')});
ThrowUserError('unknown_action', {action => $action});
}
my $format = $template->get_format("reports/report", $formatparam,

15
mozilla/webtools/bugzilla/template/en/default/global/code-error.html.tmpl
View File

@ -37,13 +37,7 @@
[% DEFAULT title = "Internal Error" %]
[% error_message = BLOCK %]
[% IF error == "action_unrecognized" %]
[% docslinks = {'query.html' => "Searching for $terms.bugs",
'query.html#list' => "$terms.Bug lists"} %]
I don't recognize the value (<em>[% action FILTER html %]</em>)
of the <em>action</em> variable.
[% ELSIF error == "attachment_local_storage_disabled" %]
[% IF error == "attachment_local_storage_disabled" %]
[% title = "Local Storage Disabled" %]
You cannot store attachments locally. This feature is disabled.
@ -450,13 +444,6 @@
[% ELSIF error == "undefined_field" %]
Form field [% field FILTER html %] was not defined.
[% ELSIF error == "unknown_action" %]
[% IF action %]
Unknown action [% action FILTER html %]!
[% ELSE %]
I could not figure out what you wanted to do.
[% END %]
[% ELSIF error == "unknown_method" %]
The requested method '[% method FILTER html %]' was not found.

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

@ -1251,10 +1251,6 @@
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
@ -1581,6 +1577,13 @@
[% END %]
token too recently to request another. Please wait a while and try again.
[% ELSIF error == "unknown_action" %]
[% IF action %]
Unknown action [% action FILTER html %]!
[% ELSE %]
I could not figure out what you wanted to do.
[% END %]
[% ELSIF error == "unknown_keyword" %]
[% title = "Unknown Keyword" %]
<code>[% keyword FILTER html %]</code> is not a known keyword.

7
mozilla/webtools/bugzilla/token.cgi
View File

@ -56,7 +56,7 @@ Bugzilla->login(LOGIN_OPTIONAL);
# Throw an error if the form does not contain an "action" field specifying
# what the user wants to do.
$action || ThrowCodeError("unknown_action");
$action || ThrowUserError('unknown_action');
# If a token was submitted, make sure it is a valid token that exists in the
# database and is the correct type for the action being taken.
@ -163,10 +163,7 @@ if ($action eq 'reqpw') {
} elsif ($action eq 'cancel_new_account') {
cancel_create_account($token);
} else {
# If the action that the user wants to take (specified in the "a" form field)
# is none of the above listed actions, display an error telling the user
# that we do not understand what they would like to do.
ThrowCodeError("unknown_action", { action => $action });
ThrowUserError('unknown_action', {action => $action});
}
exit;

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

@ -41,7 +41,7 @@ elsif ($action eq "show_user" or $action eq 'vote') {
$cgi->param('id', 'voting/user.html');
}
else {
ThrowCodeError("unknown_action", {action => $action});
ThrowUserError('unknown_action', {action => $action});
}
print $cgi->redirect('page.cgi?' . $cgi->query_string);