diff options
Diffstat (limited to 'plugins/CoreVisualizations')
-rw-r--r-- | plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php | 7 | ||||
-rw-r--r-- | plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php index 1a41a07df3..5acf9b50be 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable; use Piwik\DataTable; +use Piwik\Metrics; use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable; use Piwik\View; @@ -40,11 +41,13 @@ class AllColumns extends HtmlTable $this->dataTable->filter(function (DataTable $dataTable) use ($properties) { $columnsToDisplay = array('label', 'nb_visits'); - if (in_array('nb_uniq_visitors', $dataTable->getColumns())) { + $columns = $dataTable->getColumns(); + + if (in_array('nb_uniq_visitors', $columns)) { $columnsToDisplay[] = 'nb_uniq_visitors'; } - if (in_array('nb_users', $dataTable->getColumns())) { + if (in_array('nb_users', $columns)) { $columnsToDisplay[] = 'nb_users'; } diff --git a/plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js b/plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js index 3b62e9197e..2fa3cee126 100644 --- a/plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js +++ b/plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js @@ -94,6 +94,7 @@ var module = broadcast.getValueFromHash('module'); var action = broadcast.getValueFromHash('action'); var idGoal = broadcast.getValueFromHash('idGoal'); + var idDimension = broadcast.getValueFromHash('idDimension'); var idSite = broadcast.getValueFromUrl('idSite', url); var period = broadcast.getValueFromUrl('period', url); var date = broadcast.getValueFromUrl('date', url); @@ -109,6 +110,10 @@ url += '&idGoal=' + idGoal; } + if (idDimension) { + url += '&idDimension=' + idDimension; + } + if (period) { url += '&period=' + period; } |