diff options
Diffstat (limited to 'core/ViewDataTable.php')
| -rw-r--r-- | core/ViewDataTable.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php index 3a5ce83b74..3415c817f5 100644 --- a/core/ViewDataTable.php +++ b/core/ViewDataTable.php @@ -1273,7 +1273,7 @@ abstract class Piwik_ViewDataTable * and should therefore be ran before Sort, Limit, etc. * @return void */ - public function queueFilter($filterName, $parameters, $runBeforeGenericFilters = false) + public function queueFilter($filterName, $parameters = array(), $runBeforeGenericFilters = false) { if ($runBeforeGenericFilters) { $this->queuedFiltersPriority[] = array($filterName, $parameters); @@ -1428,4 +1428,19 @@ abstract class Piwik_ViewDataTable $url = Piwik_Url::getCurrentQueryStringWithParametersModified($params); return $url; } + + /** + * Returns whether the DataTable result will have to be expanded for the + * current request before rendering. + * + * @return bool + */ + public static function shouldLoadExpanded() + { + // if filter_column_recursive & filter_pattern_recursive are supplied, and flat isn't supplied + // we have to load all the child subtables. + return Piwik_Common::getRequestVar('filter_column_recursive', false) !== false + && Piwik_Common::getRequestVar('filter_pattern_recursive', false) !== false + && Piwik_Common::getRequestVar('flat', false) === false; + } } |