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

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

pull/5984/head
mokaddem 2020-06-05 07:47:36 +02:00
parent ff7ef393c5 a0bf64d7a1
commit 8a3f92bed8
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Model/Feed.php
View File

@ -996,8 +996,16 @@ class Feed extends AppModel
}
}
if ($feed['Feed']['delta_merge'] && !empty($existsAttributesValueToId)) {
$to_delete = array_values($existsAttributesValueToId);
$this->Event->Attribute->deleteAll(array('Attribute.id' => $to_delete, 'Attribute.deleted' => 0));
$attributesToDelete = $this->Event->Attribute->find('all', array(
'conditions' => array(
'Attribute.id' => array_values($existsAttributesValueToId)
),
'recursive' => -1
));
foreach ($attributesToDelete as $k => $attribute) {
$attributesToDelete[$k]['Attribute']['deleted'] = 1;
}
$this->Event->Attribute->saveMany($attributesToDelete); // We need to trigger callback methods
}
}
if (empty($data)) {

4
app/View/Events/resolved_attributes.ctp
View File

@ -46,8 +46,8 @@
<th><?php echo __('Similar Attributes');?></th>
<th><?php echo __('Category');?></th>
<th><?php echo __('Type');?></th>
<th><?php echo __('IDS');?><input type="checkbox" id="checkAllIDS" style="margin-top:23px;margin-left:3px;"/></th>
<th style="text-align:center;"><?php echo __('Disable Correlation');?><input type="checkbox" id="checkAllDC" style="margin:0px;"/></th>
<th><?php echo __('IDS');?><input type="checkbox" id="checkAllIDS" style="margin-top:0;margin-left:.3em"></th>
<th style="text-align:center;"><?php echo __('Disable Correlation');?><input type="checkbox" id="checkAllDC" style="margin-top:0;margin-left:.3em"></th>
<th><?php echo __('Distribution');?></th>
<th><?php echo __('Comment');?></th>
<th><?php echo __('Tags');?></th>