Refs #4040, Modify getReportDisplayProperties to add display properties for all of a plugin's reports to a list rather than to pick out the display properties for a single report.

1 files changed, 26 insertions, 32 deletions

diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index 922f473dd3..11cebd6c41 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -111,7 +111,7 @@ class Piwik_VisitTime extends Piwik_Plugin
         );
     }
     
-    public function getReportDisplayProperties(&$properties, $apiAction)
+    public function getReportDisplayProperties(&$properties)
     {
         $commonProperties = array(
             'filter_sort_column'          => 'label',
@@ -123,45 +123,39 @@ class Piwik_VisitTime extends Piwik_Plugin
             'default_view_type'           => 'graphVerticalBar'
         );
         
-        $reportViewProperties = array(
-            'VisitTime.getVisitInformationPerServerTime' => array_merge($commonProperties, array(
-                'filter_limit' => 24,
-                'graph_limit' => null,
-                'show_goals' => true,
-                'translations' => array('label' => Piwik_Translate('VisitTime_ColumnServerTime')),
-                
-                // custom parameter
-                'hideFutureHoursWhenToday' => 1,
-            )),
+        $properties['VisitTime.getVisitInformationPerServerTime'] = array_merge($commonProperties, array(
+            'filter_limit' => 24,
+            'graph_limit' => null,
+            'show_goals' => true,
+            'translations' => array('label' => Piwik_Translate('VisitTime_ColumnServerTime')),
             
-            'VisitTime.getVisitInformationPerLocalTime' => array_merge($commonProperties, array(
-                'filter_limit' => 24,
-                'graph_limit' => null,
-                'title' => Piwik_Translate('VisitTime_ColumnLocalTime'),
-                'translations' => array('label' => Piwik_Translate('VisitTime_LocalTime')),
-            )),
+            // custom parameter
+            'hideFutureHoursWhenToday' => 1,
+        ));
             
-            'VisitTime.getByDayOfWeek' => array_merge($commonProperties, array(
-                'filter_limit' => 7,
-                'graph_limit' => null,
-                'enable_sort' => false,
-                'show_all_ticks' => true,
-                'show_footer_message' =>
-                    Piwik_Translate('General_ReportGeneratedFrom', self::getDateRangeForFooterMessage()),
-                'translations' => array('label' => Piwik_Translate('VisitTime_DayOfWeek')),
-            )),
-        );
+        $properties['VisitTime.getVisitInformationPerLocalTime'] = array_merge($commonProperties, array(
+            'filter_limit' => 24,
+            'graph_limit' => null,
+            'title' => Piwik_Translate('VisitTime_ColumnLocalTime'),
+            'translations' => array('label' => Piwik_Translate('VisitTime_LocalTime')),
+        ));
+            
+        $properties['VisitTime.getByDayOfWeek'] = array_merge($commonProperties, array(
+            'filter_limit' => 7,
+            'graph_limit' => null,
+            'enable_sort' => false,
+            'show_all_ticks' => true,
+            'show_footer_message' =>
+                Piwik_Translate('General_ReportGeneratedFrom', self::getDateRangeForFooterMessage()),
+            'translations' => array('label' => Piwik_Translate('VisitTime_DayOfWeek')),
+        ));
 
         // add the visits by day of week as a related report, if the current period is not 'day'
         if (Piwik_Common::getRequestVar('period', 'day') != 'day') {
-            $reportViewProperties['VisitTime.getVisitInformationPerLocalTime']['relatedReports'] = array(
+            $properties['VisitTime.getVisitInformationPerLocalTime']['relatedReports'] = array(
                 'VisitTime.getByDayOfWeek' => Piwik_Translate('VisitTime_VisitsByDayOfWeek')
             );
         }
-        
-        if (isset($reportViewProperties[$apiAction])) {
-            $properties = $reportViewProperties[$apiAction];
-        }
     }
 
     public function archivePeriod(Piwik_ArchiveProcessor_Period $archiveProcessor)