D3Public/DataWizard
8
0
Fork 0
Code Pull Requests Projects Releases Activity

enable controller based exception handling

Browse Source
This commit is contained in:
Daniel Seifert
2021-11-03 10:16:39 +01:00
parent 3b47f4da05
commit ae09cf88a5
2 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Application/Controller/Admin/d3ActionWizard.php
View File

@ -61,24 +61,34 @@ class d3ActionWizard extends AdminDetailsController
public function runTask()
{
try {
$id = Registry::getRequest()->getRequestEscapedParameter('taskid');
$action = $this->configuration->getActionById($id);
[ $queryString, $parameters ] = $action->getQuery();
if (Registry::getConfig()->getConfigParam('d3datawizard_debug')) {
throw oxNew(
DebugException::class,
d3database::getInstance()->getPreparedStatementQuery($queryString, $parameters)
);
}
$action->run();
$this->execute();
} catch (DataWizardException|DBALException|DatabaseErrorException $e) {
Registry::getLogger()->error($e->getMessage());
Registry::getUtilsView()->addErrorToDisplay($e);
}
}
/**
* @throws DatabaseConnectionException
* @throws DatabaseErrorException
*/
protected function execute()
{
$id = Registry::getRequest()->getRequestEscapedParameter('taskid');
$action = $this->configuration->getActionById($id);
[ $queryString, $parameters ] = $action->getQuery();
if (Registry::getConfig()->getConfigParam('d3datawizard_debug')) {
throw oxNew(
DebugException::class,
d3database::getInstance()->getPreparedStatementQuery($queryString, $parameters)
);
}
$action->run();
}
public function getUserMessages()
{
return null;