Refs #4040, #4041, fix sparklines regression caused by datatable css …

…refactoring and clean up the getLastUnitGraphAcrossPlugins function (modified to set properties directly).

core/Controller.php

@@ -186,14 +186,6 @@ protected function getLastUnitGraph($currentModuleName, $currentControllerAction
     protected function getLastUnitGraphAcrossPlugins($currentModuleName, $currentControllerAction,
                                                      $columnsToDisplay, $selectableColumns = array(), $reportDocumentation = false, $apiMethod = 'API.get')
     {
-        // back up and manipulate the columns parameter
-        $backupColumns = false;
-        if (isset($_GET['columns'])) {
-            $backupColumns = $_GET['columns'];
-        }
-
-        $_GET['columns'] = implode(',', $columnsToDisplay);
-
         // load translations from meta data
         $idSite = Piwik_Common::getRequestVar('idSite');
         $period = Piwik_Common::getRequestVar('period');
@@ -214,23 +206,15 @@ protected function getLastUnitGraphAcrossPlugins($currentModuleName, $currentCon
 
         // initialize the graph and load the data
         $view = $this->getLastUnitGraph($currentModuleName, $currentControllerAction, $apiMethod);
-        $view->setColumnsToDisplay($columnsToDisplay);
-        $view->setSelectableColumns($selectableColumns);
-        $view->setColumnsTranslations($translations);
+        $view->columns_to_display = $columnsToDisplay;
+        $view->selectable_columns = array_merge($view->selectable_columns, $selectableColumns);
+        $view->translations += $translations;
 
         if ($reportDocumentation) {
-            $view->setReportDocumentation($reportDocumentation);
+            $view->documentation = $reportDocumentation;
         }
 
         $view->main();
-
-        // restore the columns parameter
-        if ($backupColumns !== false) {
-            $_GET['columns'] = $backupColumns;
-        } else {
-            unset($_GET['columns']);
-        }
-
         return $view;
     }
 

core/ViewDataTable.php

@@ -164,6 +164,7 @@ public function __construct()
         $this->viewProperties['documentation'] = false;
         $this->viewProperties['subtable_controller_action'] = false;
         $this->viewProperties['datatable_css_class'] = $this->getDefaultDataTableCssClass();
+        $this->viewProperties['selectable_columns'] = array(); // TODO: only valid for graphs... shouldn't be here.
         $this->viewProperties['columns_to_display'] = array();
 
         $columns = Piwik_Common::getRequestVar('columns', false);

core/ViewDataTable/Properties.php

@@ -127,6 +127,23 @@ class Piwik_ViewDataTable_Properties
      */
     const EXTERNAL_SERIES_TOGGLE_SHOW_ALL = 'external_series_toggle_show_all';
 
+    /**
+     * Controls whether a report's related reports are listed with the view or not.
+     */
+    const SHOW_RELATED_REPORTS = 'show_related_reports';
+
+    /**
+     * Array property that contains the names of columns that can be selected in the Series Picker.
+     * 
+     * TODO: this is only applicable to graph views. move this.
+     */
+    const SELECTABLE_COLUMNS = 'selectable_columns';
+
+    /**
+     * Contains the documentation for a report.
+     */
+    const REPORT_DOCUMENTATION = 'documentation';
+
     /**
      * Returns the set of all valid ViewDataTable properties. The result is an array with property
      * name as a key. Values of the array are undefined.

plugins/CoreHome/javascripts/sparkline.js

@@ -15,7 +15,7 @@ piwik.getSparklineColors = function () {
 
 // initializes each sparkline so they use colors defined in CSS
 piwik.initSparklines = function () {
-    $('.sparkline').each(function () {
+    $('img.sparkline').each(function () {
         var $self = $(this);
 
         if ($self.attr('src')) {
@@ -36,7 +36,7 @@ window.initializeSparklines = function () {
         // try to find sparklines and add them clickable behaviour
         graph.parent().find('div.sparkline').each(function () {
             // find the sparkline and get it's src attribute
-            var sparklineUrl = $('img.sparkline', this).attr('src');
+            var sparklineUrl = $('img.sparkline', this).attr('data-src');
 
             if (sparklineUrl != "") {
                 var params = broadcast.getValuesFromUrl(sparklineUrl);
@@ -54,15 +54,15 @@ window.initializeSparklines = function () {
 
                 // on click, reload the graph with the new url
                 $(this).click(function () {
-                    var idDataTable = graph.attr('data-graph-id'),
-                        dataTable = $('#' + idDataTable);
+                    var reportId = graph.attr('data-graph-id'),
+                        dataTable = $(piwik.DataTableManager.getDataTableByReport(reportId));
 
                     // when the metrics picker is used, the id of the data table might be updated (which is correct behavior).
                     // for example, in goal reports it might change from GoalsgetEvolutionGraph to GoalsgetEvolutionGraph1.
                     // if this happens, we can't find the graph using $('#'+idDataTable+"Chart");
                     // instead, we just use the first evolution graph we can find.
                     if (dataTable.length == 0) {
-                        dataTable = $('div.dataTableGraphEvolutionWrapper').first().closest('.dataTable');
+                        dataTable = $('div.dataTableEvolutionGraph');
                     }
 
                     // reload the datatable w/ a new column & scroll to the graph

plugins/Goals/Controller.php

@@ -122,7 +122,7 @@ protected function getGoalReportView($idGoal = false)
         $view->goalName = $goalDefinition['name'];
         $view->goalAllowMultipleConversionsPerVisit = $goalDefinition['allow_multiple'];
         $view->graphEvolution = $this->getEvolutionGraph(true, array('nb_conversions'), $idGoal);
-        $view->nameGraphEvolution = 'GoalsgetEvolutionGraph' . $idGoal;
+        $view->nameGraphEvolution = 'Goals.getEvolutionGraph' . $idGoal;
         $view->topDimensions = $this->getTopDimensions($idGoal);
 
         // conversion rate for new and returning visitors

plugins/Live/templates/getVisitorLog.twig

@@ -7,7 +7,7 @@
 {% endif %}
 {% set displayVisitorsInOwnColumn %}{% if isWidget %}0{% else %}1{% endif %}{% endset %}
 
-<span data-graph-id="VisitsSummarygetEvolutionGraph"></span>
+<span data-graph-id="VisitsSummary.getEvolutionGraph"></span>
 
 {% if error is defined %}
     {{ error.message }}

plugins/Referers/Controller.php

@@ -20,7 +20,7 @@ public function index()
         $view = new Piwik_View('@Referers/index');
 
         $view->graphEvolutionReferers = $this->getEvolutionGraph(true, Piwik_Common::REFERER_TYPE_DIRECT_ENTRY, array('nb_visits'));
-        $view->nameGraphEvolutionReferers = 'ReferersgetEvolutionGraph';
+        $view->nameGraphEvolutionReferers = 'Referers.getEvolutionGraph';
 
         // building the referers summary report
         $view->dataTableRefererType = $this->getRefererType(true);

plugins/VisitFrequency/templates/index.twig

@@ -1,6 +1,6 @@
 {{ postEvent("template_headerVisitsFrequency") }}
 
-<h2 data-graph-id="VisitFrequencygetEvolutionGraph">{{ 'VisitFrequency_ColumnReturningVisits'|translate }}</h2>
+<h2 data-graph-id="VisitFrequency.getEvolutionGraph">{{ 'VisitFrequency_ColumnReturningVisits'|translate }}</h2>
     {{ graphEvolutionVisitFrequency|raw }}
 <br/>
 

plugins/VisitsSummary/templates/index.twig

@@ -1,5 +1,5 @@
 {# This graphId must be unique for this report #}
-<h2 data-graph-id="VisitsSummarygetEvolutionGraph">{{ 'Referers_Evolution'|translate }}</h2>
+<h2 data-graph-id="VisitsSummary.getEvolutionGraph">{{ 'Referers_Evolution'|translate }}</h2>
 
 {{ graphEvolutionVisitsSummary|raw }}