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

make admin controller templates more generic

Browse Source
This commit is contained in:
Daniel Seifert
2021-07-29 16:35:25 +02:00
parent 148f4f8213
commit af10e80086
8 changed files with 167 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ class d3ActionWizard extends AdminDetailsController
return $this->configuration->getActionGroups();
}
public function getGroupActions($group)
public function getGroupTasks($group)
{
return $this->configuration->getActionsByGroup($group);
}
@ -58,10 +58,10 @@ class d3ActionWizard extends AdminDetailsController
* @throws d3ShopCompatibilityAdapterException
* @throws d3_cfg_mod_exception
*/
public function doAction()
public function runTask()
{
try {
$id = Registry::getRequest()->getRequestEscapedParameter('actionid');
$id = Registry::getRequest()->getRequestEscapedParameter('taskid');
$action = $this->configuration->getActionById($id);
[ $queryString, $parameters ] = $action->getQuery();

8
Application/Controller/Admin/d3ExportWizard.php
View File

@ -47,7 +47,7 @@ class d3ExportWizard extends AdminDetailsController
return $this->configuration->getExportGroups();
}
public function getGroupExports($group)
public function getGroupTasks($group)
{
return $this->configuration->getExportsByGroup($group);
}
@ -58,10 +58,10 @@ class d3ExportWizard extends AdminDetailsController
* @throws d3ShopCompatibilityAdapterException
* @throws d3_cfg_mod_exception
*/
public function doExport()
public function runTask()
{
try {
$id = Registry::getRequest()->getRequestEscapedParameter('exportid');
$id = Registry::getRequest()->getRequestEscapedParameter('taskid');
$export = $this->configuration->getExportById($id);
[ $queryString, $parameters ] = $export->getQuery();
@ -73,7 +73,7 @@ class d3ExportWizard extends AdminDetailsController
);
}
$export->run(Registry::getRequest()->getRequestEscapedParameter('exportformat'));
$export->run(Registry::getRequest()->getRequestEscapedParameter('format'));
} catch (DataWizardException|DBALException|DatabaseErrorException $e) {
Registry::getUtilsView()->addErrorToDisplay($e);
}