diff options
author | David Lawrence <dkl@mozilla.com> | 2014-04-07 16:42:08 +0200 |
---|---|---|
committer | David Lawrence <dkl@mozilla.com> | 2014-04-07 16:42:08 +0200 |
commit | f3f8239ff36c892c0437fc8054a68e07d7ca0020 (patch) | |
tree | 3eb1e9f4ddde3f0e434927bfe285fb5ede1f8659 /template/en/default/search | |
parent | 818b908a18de4862f060c64ad12f779ac8480f01 (diff) | |
download | bugzilla-f3f8239ff36c892c0437fc8054a68e07d7ca0020.tar.gz bugzilla-f3f8239ff36c892c0437fc8054a68e07d7ca0020.tar.xz |
Bug 990982 - backport bug 539894 to bmo (Use <optgroup/> to group products into classifications in the product drop-down on show_bug.cgi)
r=glob
Diffstat (limited to 'template/en/default/search')
-rw-r--r-- | template/en/default/search/search-instant.html.tmpl | 28 | ||||
-rw-r--r-- | template/en/default/search/search-specific.html.tmpl | 29 |
2 files changed, 10 insertions, 47 deletions
diff --git a/template/en/default/search/search-instant.html.tmpl b/template/en/default/search/search-instant.html.tmpl index 5d75d1996..94cb619d0 100644 --- a/template/en/default/search/search-instant.html.tmpl +++ b/template/en/default/search/search-instant.html.tmpl @@ -41,29 +41,11 @@ YAHOO.bugzilla.instantSearch.setLabels( { <b><label for="product">Product:</label></b> </td> <td> - <select name="product" id="product"> - [% IF Param('useclassification') %] - [% FOREACH c = classification %] - <optgroup label="[% c.name FILTER html %]"> - [% FOREACH p = user.get_selectable_products(c.id) %] - [% IF p.components.size %] - <option value="[% p.name FILTER html %]" - [% " selected" IF lsearch(default.product, p.name) != -1 %]> - [% p.name FILTER html %] - </option> - [% END %] - [% END %] - </optgroup> - [% END %] - [% ELSE %] - [% FOREACH p = product %] - <option value="[% p.name FILTER html %]" - [% " selected" IF lsearch(default.product, p.name) != -1 %]> - [% p.name FILTER html %] - </option> - [% END %] - [% END %] - </select> + [% INCLUDE "global/product-select.html.tmpl" + id => "product" + name => "product" + value => default.product.0 + %] </td> </tr> <tr> diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl index 7e5de2c4a..ea522a877 100644 --- a/template/en/default/search/search-specific.html.tmpl +++ b/template/en/default/search/search-specific.html.tmpl @@ -67,30 +67,11 @@ for "crash secure SSL flash". <label for="product">[% field_descs.product FILTER html %]:</label> </th> <td> - <select name="product" id="product"> - <option value="">All</option> - [% IF Param('useclassification') %] - [% FOREACH c = classification %] - <optgroup label="[% c.name FILTER html %]"> - [% FOREACH p = user.get_selectable_products(c.id) %] - [% IF p.components.size %] - <option value="[% p.name FILTER html %]" - [% " selected" IF default.product.contains(p.name) %]> - [% p.name FILTER html %] - </option> - [% END %] - [% END %] - </optgroup> - [% END %] - [% ELSE %] - [% FOREACH p = product %] - <option value="[% p.name FILTER html %]" - [% " selected" IF default.product.contains(p.name) %]> - [% p.name FILTER html %] - </option> - [% END %] - [% END %] - </select> + [% INCLUDE "global/product-select.html.tmpl" + id => "product" + name => "product" + add => "All" + %] </td> </tr> <tr> |