зеркало из https://github.com/mozilla/gecko-dev.git
Bug 286461:Add products table to search if classification are needed
Patch by joel r=gerv, a=justdave
This commit is contained in:
Родитель
979ec89afe
Коммит
fceed22203
|
@ -139,6 +139,8 @@ sub init {
|
||||||
push @supptables,
|
push @supptables,
|
||||||
"INNER JOIN classifications AS map_classifications " .
|
"INNER JOIN classifications AS map_classifications " .
|
||||||
"ON map_products.classification_id = map_classifications.id";
|
"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) {
|
if (lsearch($fieldsref, 'map_components.name') >= 0) {
|
||||||
|
@ -863,6 +865,8 @@ sub init {
|
||||||
|
|
||||||
"^classification,(?!changed)" => sub {
|
"^classification,(?!changed)" => sub {
|
||||||
# Generate the restriction condition
|
# Generate the restriction condition
|
||||||
|
push @supptables, "INNER JOIN products AS map_products " .
|
||||||
|
"ON bugs.product_id = map_products.id";
|
||||||
$f = $ff = "classifications.name";
|
$f = $ff = "classifications.name";
|
||||||
$funcsbykey{",$t"}->();
|
$funcsbykey{",$t"}->();
|
||||||
$term = build_subselect("map_products.classification_id",
|
$term = build_subselect("map_products.classification_id",
|
||||||
|
|
|
@ -136,12 +136,6 @@ $columns{''} = "42217354";
|
||||||
|
|
||||||
my @axis_fields = ($row_field, $col_field, $tbl_field);
|
my @axis_fields = ($row_field, $col_field, $tbl_field);
|
||||||
my @selectnames = map($columns{$_}, @axis_fields);
|
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
|
# Clone the params, so that Bugzilla::Search can modify them
|
||||||
my $params = new Bugzilla::CGI($cgi);
|
my $params = new Bugzilla::CGI($cgi);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче