diff options
author | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-07-19 15:21:50 +0400 |
---|---|---|
committer | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-07-19 15:21:50 +0400 |
commit | 0713062313967d940b8f5c34cb21d515c6b016b4 (patch) | |
tree | 03c78e68d7f4a92ba2e0085df946e5cf9c84ef76 /plugins/DBStats | |
parent | 53bf5b49f66cc138d408b4499625223d7a6e7c30 (diff) |
Refs #4041, move Piwik_ViewDataTable_GenerateGraphData logic to new JqplotDataGenerator class that does not derive from ViewDataTable and remove recursive API request used to get graph data.
Diffstat (limited to 'plugins/DBStats')
-rw-r--r-- | plugins/DBStats/Controller.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php index a4e8d08bac..2e2a38c9e6 100644 --- a/plugins/DBStats/Controller.php +++ b/plugins/DBStats/Controller.php @@ -275,8 +275,7 @@ class Piwik_DBStats_Controller extends Piwik_Controller_Admin $runPrettySizeFilterBeforeGeneric = false; $fixedMemoryUnit = false; - if ($view instanceof Piwik_ViewDataTable_HtmlTable) // if displaying a table - { + if ($view instanceof Piwik_ViewDataTable_HtmlTable) { // if displaying a table $view->disableRowEvolution(); // add summary row only if displaying a table @@ -291,8 +290,7 @@ class Piwik_DBStats_Controller extends Piwik_Controller_Admin $runBeforeGenericFilters = true); $view->setSortedColumn('percent_total', $orderDir); } - } else if ($view instanceof Piwik_ViewDataTable_GenerateGraphData) // if displaying a graph - { + } else if ($view instanceof Piwik_ViewDataTable_GenerateGraphHtml) { // if displaying a graph if (in_array('total_size', $sizeColumns)) { $view->setColumnsToDisplay(array('label', 'total_size')); @@ -320,7 +318,7 @@ class Piwik_DBStats_Controller extends Piwik_Controller_Admin 'ColumnCallbackReplace', array($sizeColumns, $getPrettySize, $params), $runPrettySizeFilterBeforeGeneric); // jqPlot will display as, well, ' ', so don't replace the spaces when rendering as a graph - if (!($view instanceof Piwik_ViewDataTable_GenerateGraphData)) { + if (!($view instanceof Piwik_ViewDataTable_GenerateGraphHtml)) { $replaceSpaces = array($this, 'replaceColumnSpaces'); $view->queueFilter('ColumnCallbackReplace', array($sizeColumns, $replaceSpaces)); } |