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

fix: [UI] Correctly fetch data from resolved MISP format

pull/8613/head
Jakub Onderka 2022-10-05 18:28:46 +02:00
parent a3d44283dc
commit d1dbde5404
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,7 @@
<span class="ObjectRelation bold"><?php echo h($attribute['object_relation']); ?></span>
<span class="AttributeType"><?php echo h($attribute['type']); ?></span>
</td>
<td class="AttributeValue limitedWidth"><?= $this->element('Events/View/value_field', ['object' => $attribute]); ?></td>
<td class="AttributeValue limitedWidth" data-value="<?= h($attribute['value']) ?>"><?= $this->element('Events/View/value_field', ['object' => $attribute]); ?></td>
<?php
if (in_array($attribute['type'], $typesWithData, true)) {
if (!empty($attribute['data'])) {
@ -374,7 +374,7 @@
}
}
?>
<td class="AttributeValue limitedWidth"><?= $this->element('Events/View/value_field', ['object' => $attribute]); ?></td>
<td class="AttributeValue limitedWidth" data-value="<?= h($attribute['value']) ?>"><?= $this->element('Events/View/value_field', ['object' => $attribute]); ?></td>
<?php
if (in_array($attribute['type'], $typesWithData, true)) {
if (!empty($attribute['data'])) {

12
app/webroot/js/misp.js
View File

@ -2882,14 +2882,6 @@ function freetextPossibleObjectTemplates() {
}
function moduleResultsSubmit(id) {
var attributeValue = function ($attributeValue) {
if ($attributeValue.find("[data-full]").length) {
return $attributeValue.find("[data-full]").data('full');
} else {
return $attributeValue.text()
}
}
var typesWithData = ['attachment', 'malware-sample'];
var data_collected = {};
var temp;
@ -2960,7 +2952,7 @@ function moduleResultsSubmit(id) {
object_relation: $(this).find('.ObjectRelation').text(),
category: $(this).find('.AttributeCategory').text(),
type: attribute_type,
value: attributeValue($(this).find('.AttributeValue')),
value: $(this).find('.AttributeValue').data('value'),
uuid: $(this).find('.AttributeUuid').text(),
to_ids: $(this).find('.AttributeToIds')[0].checked,
disable_correlation: $(this).find('.AttributeDisableCorrelation')[0].checked,
@ -3020,7 +3012,7 @@ function moduleResultsSubmit(id) {
import_attribute: $(this).find('.ImportMISPAttribute')[0].checked,
category: category_value,
type: type_value,
value: attributeValue($(this).find('.AttributeValue')),
value: $(this).find('.AttributeValue').data('value'),
uuid: $(this).find('.AttributeUuid').text(),
to_ids: $(this).find('.AttributeToIds')[0].checked,
disable_correlation: $(this).find('.AttributeDisableCorrelation')[0].checked,