tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PivotTable: Fix axis queries if only one is being filtered 

refs #10316
This commit is contained in:
Johannes Meyer 2015-11-13 11:44:00 +01:00
parent cc37ca37d9
commit d0ab001437
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Data/PivotTable.php
View File

@ -345,13 +345,19 @@ class PivotTable implements Sortable
) {
$xAxis = $this->queryXAxis()->fetchPairs();
$yAxis = $this->queryYAxis()->fetchPairs();
$xAxisKeys = array_keys($xAxis);
$yAxisKeys = array_keys($yAxis);
} else {
if ($this->xAxisFilter !== null) {
$xAxis = $this->queryXAxis()->fetchPairs();
$yAxis = $this->queryYAxis()->where($this->xAxisColumn, $xAxis)->fetchPairs();
$xAxisKeys = array_keys($xAxis);
$yAxis = $this->queryYAxis()->where($this->xAxisColumn, $xAxisKeys)->fetchPairs();
$yAxisKeys = array_keys($yAxis);
} else { // $this->yAxisFilter !== null
$yAxis = $this->queryYAxis()->fetchPairs();
$xAxis = $this->queryXAxis()->where($this->yAxisColumn, $yAxis)->fetchPairs();
$yAxisKeys = array_keys($yAxis);
$xAxis = $this->queryXAxis()->where($this->yAxisColumn, $yAxisKeys)->fetchPairs();
$xAxisKeys = array_keys($xAxis);
}
}
$pivotData = array();
@ -360,8 +366,6 @@ class PivotTable implements Sortable
'rows' => $yAxis
);
if (! empty($xAxis) && ! empty($yAxis)) {
$xAxisKeys = array_keys($xAxis);
$yAxisKeys = array_keys($yAxis);
$this->baseQuery
->where($this->xAxisColumn, $xAxisKeys)
->where($this->yAxisColumn, $yAxisKeys);