Skip to content
Extraits de code Groupes Projets
Valider 67d34ebc rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Refs #4189, allow widget factory to be included in...

Refs #4189, allow widget factory to be included in getDashboardSettingsControl() action output for tests, make sure last dashboard always overwritten by UI test start.
parent e1d338cf
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -69,7 +69,14 @@ class Controller extends \Piwik\Plugin\Controller ...@@ -69,7 +69,14 @@ class Controller extends \Piwik\Plugin\Controller
public function getDashboardSettingsControl() public function getDashboardSettingsControl()
{ {
$view = new DashboardManagerControl(); $view = new DashboardManagerControl();
return $view->render(); $result = $view->render();
if (Common::getRequestVar('includeWidgetFactory', false)) {
$factoryTemplateView = new View("@Dashboard/_widgetFactoryTemplate");
$result .= $factoryTemplateView->render();
}
return $result;
} }
public function getAvailableWidgets() public function getAvailableWidgets()
......
...@@ -134,25 +134,6 @@ class Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts extends Test_Piwik ...@@ -134,25 +134,6 @@ class Test_Piwik_Fixture_ManySitesImportedLogsWithXssAttempts extends Test_Piwik
$_GET['idDashboard'] = $id + 1; $_GET['idDashboard'] = $id + 1;
FrontController::getInstance()->fetchDispatch('Dashboard', 'saveLayout'); FrontController::getInstance()->fetchDispatch('Dashboard', 'saveLayout');
} }
// create empty dashboard
$widget = reset($allWidgets);
$dashboard = array(
array(
array(
'uniqueId' => $widget['uniqueId'],
'parameters' => $widget['parameters']
)
),
array(),
array()
);
$_GET['name'] = 'D4';
$_GET['layout'] = Common::json_encode($dashboard);
$_GET['idDashboard'] = count($dashboards) + 1;
$_GET['idSite'] = 2;
FrontController::getInstance()->fetchDispatch('Dashboard', 'saveLayout');
$_GET = $oldGet; $_GET = $oldGet;
} }
......
...@@ -25,6 +25,7 @@ class UITestFixture extends OmniFixture ...@@ -25,6 +25,7 @@ class UITestFixture extends OmniFixture
parent::setUp(); parent::setUp();
$this->addNewSitesForSiteSelector(); $this->addNewSitesForSiteSelector();
$this->createOneWidgetDashboard();
DbHelper::createAnonymousUser(); DbHelper::createAnonymousUser();
UsersManagerAPI::getInstance()->setSuperUserAccess('superUserLogin', true); UsersManagerAPI::getInstance()->setSuperUserAccess('superUserLogin', true);
...@@ -50,4 +51,34 @@ class UITestFixture extends OmniFixture ...@@ -50,4 +51,34 @@ class UITestFixture extends OmniFixture
self::createWebsite("2011-01-01 00:00:00", $ecommerce = 1, $siteName = "Site #$i", $siteUrl = "http://site$i.com"); self::createWebsite("2011-01-01 00:00:00", $ecommerce = 1, $siteName = "Site #$i", $siteUrl = "http://site$i.com");
} }
} }
public function createOneWidgetDashboard()
{
$allWidgets = array(); // TODO: redundant
foreach (WidgetsList::get() as $category => $widgets) {
$allWidgets = array_merge($allWidgets, $widgets);
}
usort($allWidgets, function ($lhs, $rhs) {
return strcmp($lhs['uniqueId'], $rhs['uniqueId']);
});
// create empty dashboard
$widget = reset($allWidgets);
$dashboard = array(
array(
array(
'uniqueId' => $widget['uniqueId'],
'parameters' => $widget['parameters']
)
),
array(),
array()
);
$_GET['name'] = 'D4';
$_GET['layout'] = Common::json_encode($dashboard);
$_GET['idDashboard'] = 5;
$_GET['idSite'] = 2;
FrontController::getInstance()->fetchDispatch('Dashboard', 'saveLayout');
}
} }
\ No newline at end of file
Subproject commit 4825b26ded61a3589b309b8a2917151441a9157f Subproject commit c3d9d74f7e7dd4eef316942545816bbbeff10203
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter