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

Merge branch 'develop' of github.com:MISP/MISP into develop

pull/8530/head
Sami Mokaddem 2022-08-04 14:50:00 +02:00
parent c215c47e18 42322ade3f
commit e4efe1b305
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Controller/AttributesController.php
View File

@ -96,12 +96,14 @@ class AttributesController extends AppController
[],
true
);
foreach ($temp as &$t) {
$t['info'] = $t['Event']['info'];
$t['org_id'] = $t['Event']['org_id'];
$t['date'] = $t['Event']['date'];
if (!empty($temp)) {
foreach ($temp as &$t) {
$t['info'] = $t['Event']['info'];
$t['org_id'] = $t['Event']['org_id'];
$t['date'] = $t['Event']['date'];
}
$attribute['Event']['RelatedAttribute'][$attribute['Attribute']['id']] = $temp;
}
$attribute['Event']['RelatedAttribute'][$attribute['Attribute']['id']] = $temp;
}
list($attributes, $sightingsData) = $this->__searchUI($attributes);

2
app/View/Attributes/ajax/recorrelationConfirmation.ctp
View File

@ -1,7 +1,7 @@
<div class="confirmation">
<?php
echo $this->Form->create('Attribute', ['style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => $baseurl . '/attributes/generateCorrelation']);
$message = __('Recorrelate instance', );
$message = __('Recorrelate instance');
$buttonTitle = __('Recorrelate');
?>
<legend><?= $message ?></legend>