summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjocuri%softhome.net <>2004-12-09 18:22:20 +0100
committerjocuri%softhome.net <>2004-12-09 18:22:20 +0100
commit1aa21d6c316162bb1a5568cf7f3639aab2ff5ea3 (patch)
tree6ae9681c5a6fa8c5c548ce6d9a03bdadc6db004a
parent21440ad5da22a7e3324e316f3654c8a2e1c4ffeb (diff)
downloadbugzilla-1aa21d6c316162bb1a5568cf7f3639aab2ff5ea3.tar.gz
bugzilla-1aa21d6c316162bb1a5568cf7f3639aab2ff5ea3.tar.xz
Patch for bug 233049: Improve error when filtering requests with component not in the selected product; patch by Marc Schumann <wurblzap@gmail.com>, r=vladd, a=justdave.
-rwxr-xr-xrequest.cgi5
-rw-r--r--template/en/default/global/code-error.html.tmpl8
2 files changed, 3 insertions, 10 deletions
diff --git a/request.cgi b/request.cgi
index 445783d47..f872d1d28 100755
--- a/request.cgi
+++ b/request.cgi
@@ -170,10 +170,11 @@ sub queue {
push(@criteria, "bugs.component_id = $component_id");
push(@excluded_columns, 'component') unless $cgi->param('do_union');
}
- else { ThrowCodeError("unknown_component", { component => $cgi->param('component') }) }
+ else { ThrowUserError("component_not_valid", { 'product' => $cgi->param('product'),
+ 'name' => $cgi->param('component') }) }
}
}
- else { ThrowCodeError("unknown_product", { product => $cgi->param('product') }) }
+ else { ThrowUserError("product_doesnt_exist", { 'product' => $cgi->param('product') }) }
}
# Filter results by flag types.
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index ae47ed349..8959437a6 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -235,14 +235,6 @@
I could not figure out what you wanted to do.
[% END %]
- [% ELSIF error == "unknown_component" %]
- [% title = "Unknown Component" %]
- There is no component named <em>[% component FILTER html %]</em>.
-
- [% ELSIF error == "unknown_product" %]
- [% title = "Unknown Product" %]
- There is no product named <em>[% product FILTER html %]</em>.
-
[% ELSE %]
[% title = "Internal error" %]
An internal error has occured, but [% terms.Bugzilla %] doesn't know