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

fix: [individuals:delete] Gracefully catches deletion of individuals associated to a user

refacto/CRUDComponent
Sami Mokaddem 2023-03-13 08:05:32 +01:00
parent 3ca6b68429
commit acb66ac4a0
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -851,6 +851,9 @@ class CRUDComponent extends Component
$query->contain($params['contain']);
}
$data = $query->first();
if (isset($params['afterFind'])) {
$data = $params['afterFind']($data, $params);
}
if (empty($data)) {
throw new NotFoundException(__('Invalid {0}.', $this->ObjectAlias));
}
@ -873,6 +876,9 @@ class CRUDComponent extends Component
$query->contain($params['contain']);
}
$data = $query->first();
if (isset($params['afterFind'])) {
$data = $params['afterFind']($data, $params);
}
if (isset($params['beforeSave'])) {
try {
$data = $params['beforeSave']($data);

11
src/Controller/IndividualsController.php
View File

@ -94,7 +94,16 @@ class IndividualsController extends AppController
public function delete($id)
{
$this->CRUD->delete($id);
$params = [
'contain' => ['Users'],
'afterFind' => function($data, $params) {
if (!empty($data['user'])) {
throw new ForbiddenException(__('Individual associated to a user cannot be deleted.'));
}
return $data;
}
];
$this->CRUD->delete($id, $params);
$responsePayload = $this->CRUD->getResponsePayload();
if (!empty($responsePayload)) {
return $responsePayload;

3
templates/Individuals/index.php
View File

@ -103,6 +103,9 @@ echo $this->element('genericElements/IndexTable/index_table', [
'icon' => 'trash',
'complex_requirement' => [
'function' => function ($row, $options) use ($loggedUser) {
if (!empty($row['user'])) { // cannot delete individuals with associated user(s)
return false;
}
return (bool)$loggedUser['role']['perm_admin'];
}
]