Fixing more test - refs #1454

VisitsSummary API does NOT call Actions API now.

git-svn-id: http://dev.piwik.org/svn/trunk@5400 59fd770c-687e-43c8-a1e3-f5a4ff64c105

4 files changed, 17 insertions, 14 deletions

diff --git a/plugins/CoreHome/templates/index.tpl b/plugins/CoreHome/templates/index.tpl
index 0c478f00b5..fd8f7cceae 100644
--- a/plugins/CoreHome/templates/index.tpl
+++ b/plugins/CoreHome/templates/index.tpl
@@ -22,7 +22,7 @@
 </div>
 </div>
 
-
+<br/><br/>
 {include file="CoreHome/templates/piwik_tag.tpl"}
 </div>
 </body>
diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php
index 670de08245..6399d8d7b4 100644
--- a/plugins/Dashboard/Controller.php
+++ b/plugins/Dashboard/Controller.php
@@ -92,6 +92,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller
 	{
 		$this->checkTokenInUrl();
 		$layout = Piwik_Common::getRequestVar('layout');
+		// Currently not used
 		$idDashboard = Piwik_Common::getRequestVar('idDashboard', 1, 'int' );
 		if(Piwik::isUserIsAnonymous())
 		{
@@ -112,6 +113,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller
 	 */
 	protected function getLayout()
 	{
+		// Currently not used
 		$idDashboard = Piwik_Common::getRequestVar('idDashboard', 1, 'int' );
 
 		if(Piwik::isUserIsAnonymous())
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index 254a3def5f..f4b2c8228c 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -94,10 +94,6 @@ class Piwik_VisitsSummary_API
 			$dataTable->filter('ColumnCallbackAddColumnQuotient', array('avg_time_on_site', 'sum_visit_length', 'nb_visits', 0));
 		}
 		
-		// include action counts from actions plugin
-		$actionCounts = Piwik_API_Proxy::getInstance()->call('Piwik_Actions_API', 'get', compact('idSite', 'period', 'date', 'segment'));
-		$this->mergeDataTables($dataTable, $actionCounts);
-		
 		// If only a computed metrics was requested, we delete other metrics
 		// that we selected only to process this one metric
 		if($countColumnsRequested == 1
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 0e89147ed9..fb634addb0 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -89,7 +89,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 	{
 		$view->urlSparklineNbVisits 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => $view->displayUniqueVisitors ? array('nb_visits', 'nb_uniq_visitors') : array('nb_visits')));
 		$view->urlSparklineNbPageviews 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_pageviews', 'nb_uniq_pageviews')));
-		$view->urlSparklineNbDownloads 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_downloads', 'nb_uniq_downloads')));
+		$view->urlSparklineNbDownloads 	    = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_downloads', 'nb_uniq_downloads')));
 		$view->urlSparklineNbOutlinks 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_outlinks', 'nb_uniq_outlinks')));
 		$view->urlSparklineAvgVisitDuration = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('avg_time_on_site')));
 		$view->urlSparklineMaxActions 		= $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('max_actions')));
@@ -99,15 +99,18 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 		$dataTableVisit = self::getVisitsSummary();
 		$dataRow = $dataTableVisit->getFirstRow();
 		
+		$dataTableActions = Piwik_Actions_API::getInstance()->get(Piwik_Common::getRequestVar('idSite'), Piwik_Common::getRequestVar('period'), Piwik_Common::getRequestVar('date'));
+		$dataActionsRow = $dataTableActions->getFirstRow();
+		
 		$view->nbUniqVisitors = $dataRow->getColumn('nb_uniq_visitors');
 		$nbVisits = $dataRow->getColumn('nb_visits');
 		$view->nbVisits = $nbVisits;
-		$view->nbPageviews = $dataRow->getColumn('nb_pageviews');
-		$view->nbUniquePageviews = $dataRow->getColumn('nb_uniq_pageviews');
-		$view->nbDownloads = $dataRow->getColumn('nb_downloads');
-		$view->nbUniqueDownloads = $dataRow->getColumn('nb_uniq_downloads');
-		$view->nbOutlinks = $dataRow->getColumn('nb_outlinks');
-		$view->nbUniqueOutlinks = $dataRow->getColumn('nb_uniq_outlinks');
+		$view->nbPageviews = $dataActionsRow->getColumn('nb_pageviews');
+		$view->nbUniquePageviews = $dataActionsRow->getColumn('nb_uniq_pageviews');
+		$view->nbDownloads = $dataActionsRow->getColumn('nb_downloads');
+		$view->nbUniqueDownloads = $dataActionsRow->getColumn('nb_uniq_downloads');
+		$view->nbOutlinks = $dataActionsRow->getColumn('nb_outlinks');
+		$view->nbUniqueOutlinks = $dataActionsRow->getColumn('nb_uniq_outlinks');
 		$view->averageVisitDuration = $dataRow->getColumn('avg_time_on_site');
 		$nbBouncedVisits = $dataRow->getColumn('bounce_count');
 		$view->bounceRate = Piwik::getPercentageSafe($nbBouncedVisits, $nbVisits);
@@ -117,8 +120,10 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 		// backward compatibility:
 		// show actions if the finer metrics are not archived
 		$view->showOnlyActions = false;
-		if ($dataRow->getColumn('nb_pageviews') + $dataRow->getColumn('nb_downloads')
-				+ $dataRow->getColumn('nb_outlinks') == 0 && $dataRow->getColumn('nb_actions') > 0)
+		if (  $dataActionsRow->getColumn('nb_pageviews') 
+			+ $dataActionsRow->getColumn('nb_downloads')
+			+ $dataActionsRow->getColumn('nb_outlinks') == 0 
+			&& $dataRow->getColumn('nb_actions') > 0)
 		{
 			$view->showOnlyActions = true;
 			$view->nbActions = $dataRow->getColumn('nb_actions');