Refs #4040, #4041, remove is_multi_evolution javascript parameter as …

…it is no longer necessary due to earlier row evolution refactoring.
matomo-org · Aug 3, 2013 · b808489 · b808489
1 parent 735b365
commit b808489
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 29 deletions.
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php
@@ -155,8 +155,8 @@ public function getMultiRowEvolutionPopover()
     public function getRowEvolutionGraph($fetch = false, $rowEvolution = null)
     {
         if (empty($rowEvolution)) {
-            $paramName = Piwik_CoreHome_DataTableRowAction_MultiRowEvolution::IS_MULTI_EVOLUTION_PARAM;
-            $isMultiRowEvolution = Common::getRequestVar($paramName, false, 'int');
+            $label = Common::getRequestVar('label', '', 'string');
+            $isMultiRowEvolution = strpos($label, ',') !== false;
 
             $rowEvolution = $this->makeRowEvolution($isMultiRowEvolution, $graphType = 'graphEvolution');
             $rowEvolution->useAvailableMetrics();

diff --git a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
@@ -19,8 +19,6 @@
 class Piwik_CoreHome_DataTableRowAction_MultiRowEvolution
     extends Piwik_CoreHome_DataTableRowAction_RowEvolution
 {
-    const IS_MULTI_EVOLUTION_PARAM = 'is_multi_evolution';
-
     /** The requested metric */
     protected $metric;
 
@@ -72,17 +70,4 @@ public function renderPopover($controller, $view)
 
         return parent::renderPopover($controller, $view);
     }
-
-    /**
-     * Generic method to get an evolution graph or a sparkline for the row evolution popover.
-     * Do as much as possible from outside the controller.
-     *
-     * @return ViewDataTable
-     */
-    public function getRowEvolutionGraph($graphType = false, $metrics = false)
-    {
-        $view = parent::getRowEvolutionGraph($graphType, $metrics);
-        $view->custom_parameters[self::IS_MULTI_EVOLUTION_PARAM] = 1; // set in JS
-        return $view;
-    }
-}
+}
diff --git a/plugins/CoreHome/javascripts/datatable.js b/plugins/CoreHome/javascripts/datatable.js
@@ -876,17 +876,7 @@ dataTable.prototype =
                     str += '&filter_limit=' + filter_limit;
                 }
                 if (label) {
-                    if (self.param.is_multi_evolution) {
-                        label = label.split(',');
-                    }
-
-                    if (label instanceof Array) {
-                        for (var i = 0; i != label.length; ++i) {
-                            str += '&label[]=' + encodeURIComponent(label[i]);
-                        }
-                    } else {
-                        str += '&label=' + encodeURIComponent(label);
-                    }
+                    str += '&label=' + encodeURIComponent(label);
                 }
                 return str;
             }