diff options
author | diosmosis <benaka@piwik.pro> | 2014-12-02 03:13:56 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2014-12-03 02:41:50 +0300 |
commit | 61f0e6a629f43dd0c4466a1b3d1224be33740221 (patch) | |
tree | 76a1d72aa0514b2eb046ec9e87351cae1e2494ac /plugins/CoreVisualizations | |
parent | 2b21d9b73bf9fc79a68def31b37be27109b3757d (diff) |
Fixes #6756, fix two regressions/bugs in row evolution of ecommerce item report: viewDataTable is overwritten by BaseEcommerceItem Report class metadata causing UI bugs since viewDataTable is not graphEvolution, graph visualizations should not format metrics in any way prior to generating jqplot JSON.
Diffstat (limited to 'plugins/CoreVisualizations')
-rw-r--r-- | plugins/CoreVisualizations/JqplotDataGenerator.php | 1 | ||||
-rw-r--r-- | plugins/CoreVisualizations/Visualizations/Graph.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php index 14e796cd0d..3b8ec8a752 100644 --- a/plugins/CoreVisualizations/JqplotDataGenerator.php +++ b/plugins/CoreVisualizations/JqplotDataGenerator.php @@ -86,7 +86,6 @@ class JqplotDataGenerator $dataTable->queueFilter('AddSummaryRow', Piwik::translate('General_Total')); } - $dataTable->applyQueuedFilters(); $this->initChartObjectData($dataTable, $visualization); } diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php index dbb1942d2a..8270ee0cfa 100644 --- a/plugins/CoreVisualizations/Visualizations/Graph.php +++ b/plugins/CoreVisualizations/Visualizations/Graph.php @@ -58,7 +58,9 @@ abstract class Graph extends Visualization $this->requestConfig->request_parameters_to_modify['filter_truncate'] = $this->config->max_graph_elements - 1; } + $this->requestConfig->disable_queued_filters = 1; $this->requestConfig->request_parameters_to_modify['disable_queued_filters'] = 1; + $this->requestConfig->request_parameters_to_modify['format_metrics'] = 0; } /** |