MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [analyst-data:crud] Do not recursively fetch child analyst-data in REST context

notes
Sami Mokaddem 2024-02-07 14:53:37 +01:00
parent ceb04b2662
commit 4fca835c39
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Controller/AnalystDataController.php
View File

@ -171,15 +171,16 @@ class AnalystDataController extends AppController
$id = $this->getIDFromUUID($type, $id);
}
$this->AnalystData->fetchRecursive = true;
if (!$this->IndexFilter->isRest()) {
$this->AnalystData->fetchRecursive = true;
}
$conditions = $this->AnalystData->buildConditions($this->Auth->user());
$this->CRUD->view($id, [
'conditions' => $conditions,
'contain' => ['Org', 'Orgc'],
'afterFind' => function(array $analystData) {
if (!$this->IndexFilter->isRest()) {
$canEdit = $this->ACL->canEditAnalystData($this->Auth->user(), $analystData, $this->modelSelection);
$analystData[$this->modelSelection]['_canEdit'] = $canEdit;
if (!$this->request->is('ajax')) {
unset($analystData[$this->modelSelection]['_canEdit']);
}
return $analystData;
}
@ -207,11 +208,8 @@ class AnalystDataController extends AppController
'conditions' => $conditions,
'afterFind' => function(array $data) {
foreach ($data as $i => $analystData) {
if (!$this->IndexFilter->isRest()) {
$canEdit = $this->ACL->canEditAnalystData($this->Auth->user(), $analystData, $this->modelSelection);
if (!$this->IndexFilter->isRest()) {
$data[$i][$this->modelSelection]['_canEdit'] = $canEdit;
}
if (!$this->request->is('ajax')) {
unset($analystData[$this->modelSelection]['_canEdit']);
}
}
return $data;