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

fix: [analyst-data:afterFind] Only rearrange key sharing-group key if they distribution exists

notes
Sami Mokaddem 2024-01-30 09:36:45 +01:00
parent 90ae8739da
commit e3b09cd5a5
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Model/AnalystData.php
View File

@ -135,16 +135,18 @@ class AnalystData extends AppModel
private function rearrangeSharingGroup(array $analystData, array $user): array
{
if ($analystData[$this->alias]['distribution'] == 4) {
if (!isset($analystData['SharingGroup'])) {
$this->SharingGroup = ClassRegistry::init('SharingGroup');
$sg = $this->SharingGroup->fetchSG($analystData[$this->alias]['sharing_group_id'], $user, true);
$analystData[$this->alias]['SharingGroup'] = $sg['SharingGroup'];
if (isset($analystData[$this->alias]['distribution'])) {
if ($analystData[$this->alias]['distribution'] == 4) {
if (!isset($analystData['SharingGroup'])) {
$this->SharingGroup = ClassRegistry::init('SharingGroup');
$sg = $this->SharingGroup->fetchSG($analystData[$this->alias]['sharing_group_id'], $user, true);
$analystData[$this->alias]['SharingGroup'] = $sg['SharingGroup'];
} else {
$analystData[$this->alias]['SharingGroup'] = $analystData['SharingGroup'];
}
} else {
$analystData[$this->alias]['SharingGroup'] = $analystData['SharingGroup'];
unset($analystData['SharingGroup']);
}
} else {
unset($analystData['SharingGroup']);
}
return $analystData;
}

2
app/View/AnalystData/add.ctp
View File

@ -83,7 +83,7 @@ if ($modelSelection === 'Note') {
'field' => 'related_object_uuid',
'class' => 'span4',
],
sprintf('<div><label>%s:</label><div id="related-object-container">%s</div></div>', __('Related Object'), __('- No UUID provided -'))
sprintf('<div style="max-width: 960px;"><label>%s:</label><div id="related-object-container">%s</div></div>', __('Related Object'), __('- No UUID provided -'))
]
);
}