diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2015-03-04 02:00:31 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2015-03-09 06:13:18 +0300 |
commit | 3c3a11b6948a9b4a32f0fa2bc9e40c6ecf2177b9 (patch) | |
tree | d26f85111435f25ffb758912c844218f8feb99e4 /core/DataTable | |
parent | c1eb5d6d0887b21a132ba09c826f4c94b9e05424 (diff) |
Run queued filters after generic filters making visualizations much faster.
Diffstat (limited to 'core/DataTable')
-rw-r--r-- | core/DataTable/Filter/PivotByDimension.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/DataTable/Filter/PivotByDimension.php b/core/DataTable/Filter/PivotByDimension.php index 61e68423e8..3eeff39b44 100644 --- a/core/DataTable/Filter/PivotByDimension.php +++ b/core/DataTable/Filter/PivotByDimension.php @@ -286,13 +286,12 @@ class PivotByDimension extends BaseFilter return null; } - if ($row->isSubtableLoaded()) { - $subtable = $row->getSubtable(); - } else { + $subtable = $row->getSubtable(); + if (!$subtable) { $subtable = $this->thisReport->fetchSubtable($idSubtable, $this->getRequestParamOverride($table)); } - if ($subtable === null) { // sanity check + if (!$subtable) { // sanity check throw new Exception("Unexpected error: could not load subtable '$idSubtable'."); } |