cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'main' into develop

pull/85/head
iglocska 2022-01-18 16:25:01 +01:00
parent f55365a03b eae8e62e5e
commit 362045f798
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Controller/Component/CRUDComponent.php
View File

@ -467,15 +467,10 @@ class CRUDComponent extends Component
if (!empty($params['contain'])) { if (!empty($params['contain'])) {
$data->contain($params['contain']); $data->contain($params['contain']);
} }
$data = $data->first();
if (isset($params['beforeSave'])) { if (isset($params['beforeSave'])) {
$data = $params['beforeSave']($data); $data = $params['beforeSave']($data);
if ($data === false) {
$skipExecution = true;
$success = false;
} }
}
if (!$skipExecution) {
$data = $data->first();
if (!empty($data)) { if (!empty($data)) {
$success = $this->Table->delete($data); $success = $this->Table->delete($data);
$success = true; $success = true;
@ -486,7 +481,6 @@ class CRUDComponent extends Component
$bulkSuccesses++; $bulkSuccesses++;
} }
} }
}
$message = $this->getMessageBasedOnResult( $message = $this->getMessageBasedOnResult(
$bulkSuccesses == count($ids), $bulkSuccesses == count($ids),
$isBulk, $isBulk,