fix: [CRUD] delete post message fix

- correct order of execution for the beforesave command
pull/92/head
iglocska 2022-01-18 16:24:24 +01:00
parent 0e427e97c9
commit eae8e62e5e
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 9 additions and 15 deletions

View File

@ -467,24 +467,18 @@ class CRUDComponent extends Component
if (!empty($params['contain'])) {
$data->contain($params['contain']);
}
$data = $data->first();
if (isset($params['beforeSave'])) {
$data = $params['beforeSave']($data);
if ($data === false) {
$skipExecution = true;
$success = false;
}
}
if (!$skipExecution) {
$data = $data->first();
if (!empty($data)) {
$success = $this->Table->delete($data);
$success = true;
} else {
$success = false;
}
if ($success) {
$bulkSuccesses++;
}
if (!empty($data)) {
$success = $this->Table->delete($data);
$success = true;
} else {
$success = false;
}
if ($success) {
$bulkSuccesses++;
}
}
$message = $this->getMessageBasedOnResult(