fixed processed metrics

core/Plugin/Report.php

@@ -26,7 +26,7 @@ class Report
     protected $widgetTitle;
     protected $widgetParams = array();
     protected $menuTitle;
-    protected $processedMetrics = false;
+    protected $processedMetrics = array();
     protected $metrics = array();
     protected $constantRowsCount = null;
     protected $isSubtableReport = null;
@@ -49,6 +49,8 @@ class Report
         $parts        = explode('\\', $classname);
         $this->module = $parts[2];
         $this->action = lcfirst($parts[4]);
+        $this->processedMetrics = Metrics::getDefaultProcessedMetrics();
+        $this->metrics          = array_keys(Metrics::getDefaultMetrics());
 
         $this->init();
     }
@@ -121,7 +123,7 @@ class Report
             if (!empty($translations[$metric])) {
                 $metrics[$metric] = $translations[$metric];
             } else {
-                $metrics[$metric] = 'To be defined';
+                $metrics[] = $metric;
             }
         }
 

plugins/API/ProcessedReport.php

@@ -205,9 +205,11 @@ class ProcessedReport
         Piwik::postEvent('API.getReportMetadata', array(&$availableReports, $parameters));
 
         foreach ($availableReports as &$availableReport) {
+            // can be removed once we remove hook API.getReportMetadata
             if (!isset($availableReport['metrics'])) {
                 $availableReport['metrics'] = Metrics::getDefaultMetrics();
             }
+            // can be removed once we remove hook API.getReportMetadata
             if (!isset($availableReport['processedMetrics'])) {
                 $availableReport['processedMetrics'] = Metrics::getDefaultProcessedMetrics();
             }
@@ -217,6 +219,7 @@ class ProcessedReport
                 unset($availableReport['metricsDocumentation']);
             } else if (!isset($availableReport['metricsDocumentation'])) {
                 // set metric documentation to default if it's not set
+                // can be removed once we remove hook API.getReportMetadata
                 $availableReport['metricsDocumentation'] = Metrics::getDefaultMetricsDocumentation();
             }
         }

plugins/Actions/Reports/Base.php

@@ -21,6 +21,7 @@ abstract class Base extends \Piwik\Plugin\Report
     protected function init()
     {
         $this->category = 'General_Actions';
+        $this->processedMetrics = false;
     }
 
     protected function addBaseDisplayProperties(ViewDataTable $view)

plugins/Events/Reports/Base.php

@@ -18,6 +18,7 @@ abstract class Base extends \Piwik\Plugin\Report
     protected function init()
     {
         $this->category = 'Events_Events';
+        $this->processedMetrics = false;
 
         $this->widgetParams = array(
             'secondaryDimension' => API::getInstance()->getDefaultSecondaryDimension($this->action)

plugins/MultiSites/Reports/GetAll.php

@@ -19,6 +19,7 @@ class GetAll extends Base
         $this->dimension     = new Website();
         $this->name          = Piwik::translate('General_AllWebsitesDashboard');
         $this->documentation = ''; // TODO
+        $this->processedMetrics = false;
         $this->constantRowsCount = false;
         $this->order = 4;
     }

plugins/MultiSites/Reports/GetOne.php

@@ -20,6 +20,7 @@ class GetOne extends Base
         $this->name          = Piwik::translate('General_SingleWebsitesDashboard');
         $this->documentation = ''; // TODO
         $this->constantRowsCount = false;
+        $this->processedMetrics = false;
         $this->order = 5;
     }
 

plugins/VisitFrequency/Reports/Get.php

@@ -19,6 +19,7 @@ class Get extends \Piwik\Plugin\Report
         $this->name          = Piwik::translate('VisitFrequency_ColumnReturningVisits');
         $this->documentation = ''; // TODO
         $this->metrics       = array('nb_visits_returning', 'nb_actions_returning', 'avg_time_on_site_returning', 'bounce_rate_returning', 'nb_actions_per_visit_returning', 'nb_uniq_visitors_returning');
+        $this->processedMetrics = false;
         $this->order = 40;
     }
 }

plugins/VisitorInterest/Reports/GetNumberOfVisitsByDaysSinceLast.php

@@ -21,6 +21,7 @@ class GetNumberOfVisitsByDaysSinceLast extends Base
         $this->name          = Piwik::translate('VisitorInterest_VisitsByDaysSinceLast');
         $this->documentation = Piwik::translate('VisitorInterest_WidgetVisitsByDaysSinceLastDocumentation');
         $this->metrics       = array('nb_visits');
+        $this->processedMetrics  = false;
         $this->constantRowsCount = true;
         $this->order = 30;
         $this->widgetTitle  = 'VisitorInterest_WidgetVisitsByDaysSinceLast';

plugins/VisitorInterest/Reports/GetNumberOfVisitsByVisitCount.php

@@ -23,6 +23,7 @@ class GetNumberOfVisitsByVisitCount extends Base
         $this->documentation = Piwik::translate('VisitorInterest_WidgetVisitsByNumDocumentation')
                              . '<br />' . Piwik::translate('General_ChangeTagCloudView');
         $this->metrics       = array('nb_visits', 'nb_visits_percentage');
+        $this->processedMetrics  = false;
         $this->constantRowsCount = true;
         $this->order = 25;
         $this->widgetTitle  = 'VisitorInterest_visitsByVisitCount';

plugins/VisitorInterest/Reports/GetNumberOfVisitsPerPage.php

@@ -24,6 +24,7 @@ class GetNumberOfVisitsPerPage extends Base
         $this->documentation = Piwik::translate('VisitorInterest_WidgetPagesDocumentation')
                              . '<br />' . Piwik::translate('General_ChangeTagCloudView');
         $this->metrics       = array('nb_visits');
+        $this->processedMetrics  = false;
         $this->constantRowsCount = true;
         $this->order = 20;
         $this->widgetTitle  = 'VisitorInterest_WidgetPages';

plugins/VisitorInterest/Reports/GetNumberOfVisitsPerVisitDuration.php

@@ -24,6 +24,7 @@ class GetNumberOfVisitsPerVisitDuration extends Base
         $this->documentation = Piwik::translate('VisitorInterest_WidgetLengthsDocumentation')
                              . '<br />' . Piwik::translate('General_ChangeTagCloudView');
         $this->metrics       = array('nb_visits');
+        $this->processedMetrics  = false;
         $this->constantRowsCount = true;
         $this->order = 15;
         $this->widgetTitle  = 'VisitorInterest_WidgetLengths';

plugins/VisitsSummary/Reports/Get.php

@@ -18,6 +18,7 @@ class Get extends \Piwik\Plugin\Report
         $this->category      = 'VisitsSummary_VisitsSummary';
         $this->name          = Piwik::translate('VisitsSummary_VisitsSummary');
         $this->documentation = ''; // TODO
+        $this->processedMetrics = false;
         $this->metrics       = array(
             'nb_uniq_visitors',
             'nb_visits',