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

r=gerv,a=justdave


git-svn-id: svn://10.0.0.236/trunk@265326 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-04-16 18:45:46 +00:00
parent c5d9b2a769
commit 8c79eeb056
4 changed files with 23 additions and 12 deletions

View File

@ -1 +1 @@
8986
8987

View File

@ -1 +1 @@
65a0dd9e19a7465217ef596709a3cb76235dd92b
e93a383f01ba32b3949e688b9f261ca57606d802

View File

@ -47,29 +47,39 @@
[% END %]
[% IF Param('useclassification') %]
[% product_ids = {} %]
[% classifications = {} %]
[% IF products %]
[% FOREACH p = products %]
[% key = p.id -%]
[% product_ids.$key = p.id -%]
[% IF NOT classifications.${p.classification.name}.defined %]
[% classifications.${p.classification.name} = [] %]
[% END %]
[% classifications.${p.classification.name}.push(p) %]
[% END %]
[% ELSE %]
[% FOREACH c = user.get_selectable_classifications %]
[% classifications.${c.name} = [] %]
[% FOREACH p = user.get_selectable_products(c.id) %]
[% classifications.${c.name}.push(p) %]
[% END %]
[% END %]
[% END %]
[% FOREACH c = user.get_selectable_classifications %]
<optgroup label="[% c.name FILTER html %]">
[% FOREACH p = user.get_selectable_products(c.id) %]
[% NEXT IF (products && ! product_ids.exists(p.id)) %]
[% FOREACH c = classifications.keys.sort %]
<optgroup label="[% c FILTER html %]">
[% FOREACH p = classifications.$c %]
<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 %]
</option>
[% END %]
</optgroup>
[% END %]
[% ELSE %]
[% products = user.get_selectable_products UNLESS products %]
[% IF NOT products.defined %]
[% products = user.get_selectable_products %]
[% END %]
[% FOREACH p = products %]
<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 %]
</option>
[% END %]

View File

@ -55,6 +55,7 @@
id => "product"
name => "product"
multiple => 5
value => product
%]
</td>
</tr>