mirror of https://github.com/MISP/MISP
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 objectpull/3856/head
parent
0c40e91ca7
commit
abbc036436
|
@ -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']])) {
|
||||
|
|
Loading…
Reference in New Issue