Refs #4041, mild refactoring to ViewDataTable, handle max_graph_elements property w/ filter_truncate instead of directly executing filter and fix bug in JqplotGraph's constructor.

2 files changed, 2 insertions, 10 deletions

diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php
index 9642aabf1b..6de29e226b 100644
--- a/plugins/CoreVisualizations/JqplotDataGenerator.php
+++ b/plugins/CoreVisualizations/JqplotDataGenerator.php
@@ -83,16 +83,6 @@ class JqplotDataGenerator
      */
     public function generate($dataTable)
     {
-        if (!empty($this->properties['visualization_properties']->max_graph_elements)) {
-            $offsetStartSummary = $this->properties['visualization_properties']->max_graph_elements - 1;
-            $sortColumn = !empty($this->properties['filter_sort_column'])
-                ? $this->properties['filter_sort_column']
-                : Metrics::INDEX_NB_VISITS;
-
-            $dataTable->filter(
-                'AddSummaryRow', array($offsetStartSummary, Piwik_Translate('General_Others'), $sortColumn));
-        }
-
         if ($dataTable->getRowsCount() > 0) {
             // if addTotalRow was called in GenerateGraphHTML, add a row containing totals of
             // different metrics
diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph.php
index 0703d7e9aa..71a9ef9b2c 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph.php
@@ -46,6 +46,8 @@ class JqplotGraph extends Graph
      */
     public function __construct($view)
     {
+        parent::__construct($view);
+        
         // do not sort if sorted column was initially "label" or eg. it would make "Visits by Server time" not pretty
         if ($view->filter_sort_column != 'label') {
             $columns = $view->columns_to_display;