summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Search.pm4
-rwxr-xr-xreport.cgi6
2 files changed, 4 insertions, 6 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 1f8e53ea3..0283b7f76 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -139,6 +139,8 @@ sub init {
push @supptables,
"INNER JOIN classifications AS map_classifications " .
"ON map_products.classification_id = map_classifications.id";
+ push @supptables, "INNER JOIN products AS map_products " .
+ "ON bugs.product_id = map_products.id";
}
if (lsearch($fieldsref, 'map_components.name') >= 0) {
@@ -863,6 +865,8 @@ sub init {
"^classification,(?!changed)" => sub {
# Generate the restriction condition
+ push @supptables, "INNER JOIN products AS map_products " .
+ "ON bugs.product_id = map_products.id";
$f = $ff = "classifications.name";
$funcsbykey{",$t"}->();
$term = build_subselect("map_products.classification_id",
diff --git a/report.cgi b/report.cgi
index a2beeebf1..30c7cade8 100755
--- a/report.cgi
+++ b/report.cgi
@@ -136,12 +136,6 @@ $columns{''} = "42217354";
my @axis_fields = ($row_field, $col_field, $tbl_field);
my @selectnames = map($columns{$_}, @axis_fields);
-# add product if person is requesting classification
-if (lsearch(\@axis_fields,"classification") >= 0) {
- if (lsearch(\@axis_fields,"product") < 0) {
- push(@selectnames,($columns{'product'}));
- }
-}
# Clone the params, so that Bugzilla::Search can modify them
my $params = new Bugzilla::CGI($cgi);