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

fix: [api] Sharing group organisations not iterated if they don't exist

pull/3766/head
iglocska 2018-10-04 22:48:50 +02:00
parent 92eb8a91ad
commit 543fccdc58
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/SharingGroup.php
View File

@ -187,6 +187,7 @@ class SharingGroup extends AppModel
));
}
$sg['Organisation'] = $this->__sgoCache[$sg['SharingGroup']['org_id']];
if (!empty($sg['SharingGroupOrg'])) {
foreach ($sg['SharingGroupOrg'] as &$sgo) {
if (!isset($this->__sgoCache[$sgo['org_id']])) {
$this->__sgoCache[$sgo['org_id']] = $this->Organisation->find('first', array(
@ -198,6 +199,7 @@ class SharingGroup extends AppModel
$sgo['Organisation'] = $this->__sgoCache[$sgo['org_id']];
}
}
}
return $sgs;
} elseif ($scope == 'name') {
$sgs = $this->find('list', array(