diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-08-11 14:26:18 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-08-11 14:26:18 +0400 |
commit | 7ef891e7ce058a9cb23de75690f6117181e06e45 (patch) | |
tree | d0cdf72f5ad048885e5ba12d9d6e9b2369e4e7a9 /plugins/CoreHome/DataTableRowAction/RowEvolution.php | |
parent | f9b15e948fc9639ada0f925a5d450e6e158b5f56 (diff) |
Merge with Master + fix build + Namespaces conquest check
Diffstat (limited to 'plugins/CoreHome/DataTableRowAction/RowEvolution.php')
-rw-r--r-- | plugins/CoreHome/DataTableRowAction/RowEvolution.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index c23235009c..081b9ad374 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -8,6 +8,9 @@ * @category Piwik_Plugins * @package CoreHome */ +namespace Piwik\Plugins\CoreHome\DataTableRowAction; + +use Exception; use Piwik\API\ResponseBuilder; use Piwik\API\Request; use Piwik\Common; @@ -23,7 +26,7 @@ use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution as Evo * The class handles the popover that shows the evolution of a singe row in a data table * @package CoreHome */ -class Piwik_CoreHome_DataTableRowAction_RowEvolution +class RowEvolution { /** The current site id */ @@ -52,7 +55,7 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution /** * The data - * @var Piwik\DataTable + * @var \Piwik\DataTable */ protected $dataTable; @@ -186,12 +189,12 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution public function getRowEvolutionGraph($graphType = false, $metrics = false) { // set up the view data table - $view = ViewDataTable::factory($graphType ?: $this->graphType, $this->apiMethod, + $view = ViewDataTable::factory($graphType ? : $this->graphType, $this->apiMethod, $controllerAction = 'CoreHome.getRowEvolutionGraph', $forceDefault = true); $view->setDataTable($this->dataTable); if (!empty($this->graphMetrics)) { // In row Evolution popover, this is empty - $view->columns_to_display = array_keys($metrics ?: $this->graphMetrics); + $view->columns_to_display = array_keys($metrics ? : $this->graphMetrics); } $view->show_goals = false; @@ -217,7 +220,7 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution protected function getMetricsToggles() { $chart = new Evolution; - + $i = 0; $metrics = array(); foreach ($this->availableMetrics as $metric => $metricData) { |