Bug 798927: An error should be thrown when passing an illegal pronoun

r=LpSolit a=justdave

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index a7600f44941fb165de0b5172c3f35a3510844a17..7bd4381ed11822e98a6f4a1a4e9183457922a73d 100644 (file)
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -2196,7 +2196,8 @@ sub pronoun {
     if ($noun eq "%qacontact%") {
         return "COALESCE(bugs.qa_contact,0)";
     }
-    return 0;
+
+    ThrowUserError('illegal_pronoun', { pronoun => $noun });
 }
 
 sub _contact_pronoun {

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 1a3aa07ac59e8e6912423564720804fa592d2882..939eb2c3c8428ce51d5e48de431ddeceef8609fd 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -891,6 +891,13 @@
     Your group control combination for group "
     [% groupname FILTER html %]" is illegal.
 
+  [% ELSIF error == "illegal_pronoun" %]
+    [% title = "Illegal Pronoun" %]
+    The pronoun you used ([% pronoun FILTER html %]) is illegal. You must use
+    one of the approved pronouns. Please see
+    <a href="[% docs_urlbase FILTER html %]query.html#pronouns">Pronoun Substitution</a>
+    for a complete list.
+
   [% ELSIF error == "illegal_query_name" %]
     [% title = "Illegal Search Name" %]
     The name of your search cannot contain any of the following characters: