Commit e93a383f authored by David Lawrence's avatar David Lawrence

Bug 994619 - show_bug product list is sometimes missing the actual product a bug is in

r=gerv,a=justdave
parent 65a0dd9e
...@@ -47,29 +47,39 @@ ...@@ -47,29 +47,39 @@
[% END %] [% END %]
[% IF Param('useclassification') %] [% IF Param('useclassification') %]
[% product_ids = {} %] [% classifications = {} %]
[% IF products %] [% IF products %]
[% FOREACH p = products %] [% FOREACH p = products %]
[% key = p.id -%] [% IF NOT classifications.${p.classification.name}.defined %]
[% product_ids.$key = p.id -%] [% classifications.${p.classification.name} = [] %]
[% END %]
[% classifications.${p.classification.name}.push(p) %]
[% END %] [% END %]
[% END %] [% ELSE %]
[% FOREACH c = user.get_selectable_classifications %] [% FOREACH c = user.get_selectable_classifications %]
<optgroup label="[% c.name FILTER html %]"> [% classifications.${c.name} = [] %]
[% FOREACH p = user.get_selectable_products(c.id) %] [% FOREACH p = user.get_selectable_products(c.id) %]
[% NEXT IF (products && ! product_ids.exists(p.id)) %] [% classifications.${c.name}.push(p) %]
[% END %]
[% END %]
[% END %]
[% FOREACH c = classifications.keys.sort %]
<optgroup label="[% c FILTER html %]">
[% FOREACH p = classifications.$c %]
<option value="[% p.$valueattribute FILTER html %]" <option value="[% p.$valueattribute FILTER html %]"
[% " selected" IF (cgi.param(name) == p.name) || (value == p.name) %]> [% " selected" IF (cgi.param(name) == p.name) || (value.contains(p.name)) %]>
[% p.name FILTER html %] [% p.name FILTER html %]
</option> </option>
[% END %] [% END %]
</optgroup> </optgroup>
[% END %] [% END %]
[% ELSE %] [% ELSE %]
[% products = user.get_selectable_products UNLESS products %] [% IF NOT products.defined %]
[% products = user.get_selectable_products %]
[% END %]
[% FOREACH p = products %] [% FOREACH p = products %]
<option value="[% p.$valueattribute FILTER html %]" <option value="[% p.$valueattribute FILTER html %]"
[% " selected" IF (cgi.param(name) == p.name) || (value == p.name) %]> [% " selected" IF (cgi.param(name) == p.name) || (value.contains(p.name)) %]>
[% p.name FILTER html %] [% p.name FILTER html %]
</option> </option>
[% END %] [% END %]
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
id => "product" id => "product"
name => "product" name => "product"
multiple => 5 multiple => 5
value => product
%] %]
</td> </td>
</tr> </tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment