From b3e8788622706cc7b35a91da6429e08ed0d7f8a1 Mon Sep 17 00:00:00 2001 From: pebosi Date: Mon, 8 Apr 2013 22:35:45 +0200 Subject: [PATCH 1/2] refs #3882 Use table instead of tableGoals on Visits-Days to Conversion reports --- plugins/Goals/Controller.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index 35d795a23f5..b4eae8d7aa9 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -359,11 +359,11 @@ protected function getTopDimensions($idGoal) $topDimensions = array(); foreach ($topDimensionsToLoad as $dimensionName => $apiMethod) { $request = new Piwik_API_Request("method=$apiMethod - &format=original - &filter_update_columns_when_show_all_goals=1 - &idGoal=" . Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal::GOALS_FULL_TABLE . " - &filter_sort_order=desc - &filter_sort_column=$columnNbConversions" . + &format=original + &filter_update_columns_when_show_all_goals=1 + &idGoal=" . Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal::GOALS_FULL_TABLE . " + &filter_sort_order=desc + &filter_sort_column=$columnNbConversions" . // select a couple more in case some are not valid (ie. conversions==0 or they are "Keyword not defined") "&filter_limit=" . (self::COUNT_TOP_ROWS_TO_DISPLAY + 2)); $datatable = $request->process(); @@ -522,6 +522,9 @@ private function getGoalReportsByDimensionTable($conversions, $ecommerce = false foreach ($allReports as $category => $reports) { $categoryText = Piwik_Translate('Goals_ViewGoalsBy', $category); foreach ($reports as $report) { + if ($report['module'] == 'Goals') { + $customParams['viewDataTable'] = 'table'; + } $goalReportsByDimension->addReport( $categoryText, $report['name'], $report['module'] . '.' . $report['action'], $customParams); } From c5439aa9c49c8aa04d462d7247b3045318c4f40c Mon Sep 17 00:00:00 2001 From: pebosi Date: Mon, 8 Apr 2013 22:38:36 +0200 Subject: [PATCH 2/2] tabs / spaces... --- plugins/Goals/Controller.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index b4eae8d7aa9..86cf879dc3c 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -359,11 +359,11 @@ protected function getTopDimensions($idGoal) $topDimensions = array(); foreach ($topDimensionsToLoad as $dimensionName => $apiMethod) { $request = new Piwik_API_Request("method=$apiMethod - &format=original - &filter_update_columns_when_show_all_goals=1 - &idGoal=" . Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal::GOALS_FULL_TABLE . " - &filter_sort_order=desc - &filter_sort_column=$columnNbConversions" . + &format=original + &filter_update_columns_when_show_all_goals=1 + &idGoal=" . Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal::GOALS_FULL_TABLE . " + &filter_sort_order=desc + &filter_sort_column=$columnNbConversions" . // select a couple more in case some are not valid (ie. conversions==0 or they are "Keyword not defined") "&filter_limit=" . (self::COUNT_TOP_ROWS_TO_DISPLAY + 2)); $datatable = $request->process();