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

fix: [sharing groups] Fixed several sharing group issues preventing proper editing of events with SGs 

- include the uuid and modified time in the sharing group
- fix the incorrectly embedded organisation object
pull/3856/head
iglocska 2018-11-07 16:06:49 +01:00
parent 0c40e91ca7
commit abbc036436
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/SharingGroup.php
View File

@ -156,6 +156,8 @@ class SharingGroup extends AppModel
array(
'fields' => array(
'SharingGroup.id',
'SharingGroup.uuid',
'SharingGroup.modified',
'SharingGroup.name',
'SharingGroup.releasability',
'SharingGroup.description',
@ -187,7 +189,7 @@ class SharingGroup extends AppModel
'conditions' => array('id' => $sg['SharingGroup']['org_id'])
));
}
$sg['Organisation'] = $this->__sgoCache[$sg['SharingGroup']['org_id']];
$sg['Organisation'] = $this->__sgoCache[$sg['SharingGroup']['org_id']]['Organisation'];
if (!empty($sg['SharingGroupOrg'])) {
foreach ($sg['SharingGroupOrg'] as &$sgo) {
if (!isset($this->__sgoCache[$sgo['org_id']])) {