Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

This commit is contained in:
yuri
2018-11-19 12:43:38 +02:00
+3 -6
View File
@@ -218,7 +218,7 @@ class Tester
if (!empty($this->params['pathToFiles'])) {
$this->getDataLoader()->loadFiles($this->params['pathToFiles']);
$applyChanges = true;
$this->getApplication(true, true)->runRebuild();
}
if (!empty($this->params['dataFile'])) {
@@ -232,17 +232,14 @@ class Tester
}
if ($applyChanges) {
$this->clearVars();
$this->getApplication()->runRebuild();
$this->getApplication(true, true)->runRebuild();
}
}
public function setData(array $data)
{
$this->getDataLoader()->setData($data);
$this->clearVars();
$this->getApplication()->runRebuild();
$this->getApplication(true, true)->runRebuild();
}
public function clearCache()