From cc8a9d16fc0e991ed3c60d1f1164479154fdb9af Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Thu, 15 Jan 2015 19:34:50 +0000
Subject: [PATCH] fixed engangement screen which was wrong because of a merge
and updated submodule to fix more ui tests
---
plugins/VisitorInterest/Controller.php | 25 +++++--------------------
tests/PHPUnit/UI | 2 +-
2 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/plugins/VisitorInterest/Controller.php b/plugins/VisitorInterest/Controller.php
index 939318534e..835af723fe 100644
--- a/plugins/VisitorInterest/Controller.php
+++ b/plugins/VisitorInterest/Controller.php
@@ -18,26 +18,11 @@ class Controller extends \Piwik\Plugin\Controller
{
public function index()
{
- $byDimension = new View\ReportsByDimension('VisitorInterest');
-
- $reportsToAdd = array(
- new GetNumberOfVisitsPerVisitDuration(),
- new GetNumberOfVisitsPerPage(),
- new GetNumberOfVisitsByVisitCount(),
- new GetNumberOfVisitsByDaysSinceLast()
- );
-
- foreach ($reportsToAdd as $report) {
- /** @var \Piwik\Plugin\Report $report */
- $byDimension->addReport(
- $report->getCategory(),
- $report->getWidgetTitle(),
- $report->getModule() . '.' . $report->getAction(),
- array());
- }
-
$view = new View('@VisitorInterest/index');
- $view->reports = $byDimension->render();
+ $view->dataTableNumberOfVisitsPerVisitDuration = $this->renderReport(new GetNumberOfVisitsPerVisitDuration());
+ $view->dataTableNumberOfVisitsPerPage = $this->renderReport(new GetNumberOfVisitsPerPage());
+ $view->dataTableNumberOfVisitsByVisitNum = $this->renderReport(new GetNumberOfVisitsByVisitCount());
+ $view->dataTableNumberOfVisitsByDaysSinceLast = $this->renderReport(new GetNumberOfVisitsByDaysSinceLast());
return $view->render();
}
-}
+}
\ No newline at end of file
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index 0fe06fd7a0..4e4eac96ab 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit 0fe06fd7a0ad7ffe19ae1262a2c4dd44f3f64668
+Subproject commit 4e4eac96ab2051285ad453a0e845801e217d6f72
--
GitLab