diff options
| author | Byron Jones <bjones@mozilla.com> | 2012-11-22 09:23:53 +0100 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2012-11-22 09:23:53 +0100 |
| commit | da12cec61f8c7e667b00fc5fc39c827d3593f021 (patch) | |
| tree | a7993cf0d3ad5c534dd7604b827c8ce8267fcf38 /template/en | |
| parent | ceafb43c1653b9f596965b8ead840f4cd6a29156 (diff) | |
| download | bugzilla-da12cec61f8c7e667b00fc5fc39c827d3593f021.tar.gz bugzilla-da12cec61f8c7e667b00fc5fc39c827d3593f021.tar.xz | |
Bug 780820: Allows for multiple custom search criteria to match one field
r=dkl,a=LpSolit
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 11 | ||||
| -rw-r--r-- | template/en/default/search/boolean-charts.html.tmpl | 13 |
2 files changed, 21 insertions, 3 deletions
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 6a34cbd0d..a7d1de6f9 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1597,6 +1597,17 @@ and the "matches" search can only be used with the "content" field. + [% ELSIF error == "search_grouped_field_invalid" %] + [% terms.Bugzilla %] does not support using the + "[%+ field_descs.$field FILTER html %]" ([% field FILTER html %]) + field with grouped search conditions. + + [% ELSIF error == "search_grouped_invalid_nesting" %] + You cannot nest clauses within grouped search conditions. + + [% ELSIF error == "search_grouped_field_mismatch" %] + All conditions under a groups search must use the same field. + [% ELSIF error == "search_field_operator_invalid" %] [% terms.Bugzilla %] does not support using the "[%+ field_descs.$field FILTER html %]" ([% field FILTER html %]) diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl index e37d9d80e..df369eb29 100644 --- a/template/en/default/search/boolean-charts.html.tmpl +++ b/template/en/default/search/boolean-charts.html.tmpl @@ -64,6 +64,10 @@ <script type="text/javascript" src="[% 'js/history.js/native.history.js' FILTER mtime %]"></script> <script type="text/javascript"> redirect_html4_browsers(); + [%# These are alternative labels for the AND and OR options in and_all_select %] + var cs_and_label = 'Match ALL of the following:'; + var cs_or_label = 'Match ANY of the following:'; + cs_reconfigure('custom_search_last_row'); </script> </div> @@ -120,7 +124,8 @@ ( [% indent_level = indent_level + 1 %] [% ELSIF condition.f == "CP" %] - <input type="hidden" name="f[% cond_num FILTER html %]" value="CP"> + <input type="hidden" name="f[% cond_num FILTER html %]" + id="f[% cond_num FILTER html %]" value="CP"> ) [% ELSE %] <select name="f[% cond_num FILTER html %]" title="Field" @@ -164,9 +169,11 @@ <div class="any_all_select"> <select name="[% name FILTER html %]" id="[% name FILTER html %]" onchange="fix_query_string(this)"> - <option value="AND">Match ALL of the following:</option> + <option value="AND">Match ALL of the following separately:</option> <option value="OR" [% ' selected="selected"' IF selected == "OR" %]> - Match ANY of the following:</option> + Match ANY of the following separately:</option> + <option value="AND_G" [% ' selected' IF selected == "AND_G" %]> + Match ALL of the following against the same field:</option> </select> [% IF with_advanced_link %] <a id="custom_search_advanced_controller" |