Skip to content
Snippets Groups Projects
Verified Commit 10982699 authored by Damien's avatar Damien
Browse files

FEAT #12091 TIME 0:15 Fix actions when errors

parent 0b045b05
No related branches found
No related tags found
No related merge requests found
...@@ -377,6 +377,7 @@ class ActionMethodController ...@@ -377,6 +377,7 @@ class ActionMethodController
$loadedXml = CoreConfigModel::getXmlLoaded(['path' => 'modules/visa/xml/remoteSignatoryBooks.xml']); $loadedXml = CoreConfigModel::getXmlLoaded(['path' => 'modules/visa/xml/remoteSignatoryBooks.xml']);
$config = []; $config = [];
$historyInfo = '';
if (!empty($loadedXml)) { if (!empty($loadedXml)) {
$config['id'] = 'maarchParapheur'; $config['id'] = 'maarchParapheur';
foreach ($loadedXml->signatoryBook as $value) { foreach ($loadedXml->signatoryBook as $value) {
...@@ -697,6 +698,7 @@ class ActionMethodController ...@@ -697,6 +698,7 @@ class ActionMethodController
if ($message == null) { if ($message == null) {
return true; return true;
} }
return ['history' => $message]; return ['history' => $message];
} }
......
...@@ -437,7 +437,7 @@ class ResourceListController ...@@ -437,7 +437,7 @@ class ResourceListController
$method = ActionMethodController::COMPONENTS_ACTIONS[$action['component']]; $method = ActionMethodController::COMPONENTS_ACTIONS[$action['component']];
$methodResponses = []; $methodResponses = [];
foreach ($resourcesForAction as $resId) { foreach ($resourcesForAction as $key => $resId) {
if (!empty($method)) { if (!empty($method)) {
$methodResponse = ActionMethodController::$method(['resId' => $resId, 'data' => $body['data'], 'note' => $body['note']]); $methodResponse = ActionMethodController::$method(['resId' => $resId, 'data' => $body['data'], 'note' => $body['note']]);
...@@ -446,6 +446,7 @@ class ResourceListController ...@@ -446,6 +446,7 @@ class ResourceListController
$methodResponses['errors'] = []; $methodResponses['errors'] = [];
} }
$methodResponses['errors'] = array_merge($methodResponses['errors'], $methodResponse['errors']); $methodResponses['errors'] = array_merge($methodResponses['errors'], $methodResponse['errors']);
unset($resourcesForAction[$key]);
} }
if (!empty($methodResponse['data'])) { if (!empty($methodResponse['data'])) {
if (empty($methodResponses['data'])) { if (empty($methodResponses['data'])) {
...@@ -458,9 +459,6 @@ class ResourceListController ...@@ -458,9 +459,6 @@ class ResourceListController
$historic = empty($methodResponse['history']) ? '' : $methodResponse['history']; $historic = empty($methodResponse['history']) ? '' : $methodResponse['history'];
ActionMethodController::terminateAction(['id' => $aArgs['actionId'], 'resources' => $resourcesForAction, 'basketName' => $basket['basket_name'], 'note' => $body['note'], 'history' => $historic]); ActionMethodController::terminateAction(['id' => $aArgs['actionId'], 'resources' => $resourcesForAction, 'basketName' => $basket['basket_name'], 'note' => $body['note'], 'history' => $historic]);
if (!empty($methodResponses['errors'])) {
return $response->withStatus(403)->withJson($methodResponses);
}
if (!empty($methodResponses)) { if (!empty($methodResponses)) {
return $response->withJson($methodResponses); return $response->withJson($methodResponses);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment