mirror of https://github.com/MISP/MISP
fix: [enrichment] Removed possibility to display freetext result in the new module results view
parent
b38b703dc7
commit
68019b63c9
|
@ -5169,13 +5169,9 @@ class EventsController extends AppController
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->set('event', $event);
|
$this->set('event', $event);
|
||||||
if (!empty($result['results'])) {
|
$this->set('menuItem', 'enrichmentResults');
|
||||||
$this->__handleSimplifiedFormat($attribute, $module, $options, $result, $type, $event = true, $render_name = 'resolved_misp_format');
|
$this->set('title', 'Enrichment Results');
|
||||||
} else {
|
$this->render('resolved_misp_format');
|
||||||
$this->set('menuItem', 'enrichmentResults');
|
|
||||||
$this->set('title', 'Enrichment Results');
|
|
||||||
$this->render('resolved_misp_format');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5215,7 +5211,7 @@ class EventsController extends AppController
|
||||||
$this->__handleSimplifiedFormat($attribute, $module, $options, $result, $type);
|
$this->__handleSimplifiedFormat($attribute, $module, $options, $result, $type);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function __handleSimplifiedFormat($attribute, $module, $options, $result, $type, $event = false, $renderName = 'resolved_attributes')
|
private function __handleSimplifiedFormat($attribute, $module, $options, $result, $type, $event = false)
|
||||||
{
|
{
|
||||||
$resultArray = $this->Event->handleModuleResult($result, $attribute[0]['Attribute']['event_id']);
|
$resultArray = $this->Event->handleModuleResult($result, $attribute[0]['Attribute']['event_id']);
|
||||||
if (!empty($result['comment'])) {
|
if (!empty($result['comment'])) {
|
||||||
|
@ -5255,7 +5251,7 @@ class EventsController extends AppController
|
||||||
$this->set('typeCategoryMapping', $typeCategoryMapping);
|
$this->set('typeCategoryMapping', $typeCategoryMapping);
|
||||||
$this->set('title', 'Enrichment Results');
|
$this->set('title', 'Enrichment Results');
|
||||||
$this->set('importComment', $importComment);
|
$this->set('importComment', $importComment);
|
||||||
$this->render($renderName);
|
$this->render('resolved_attributes');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function handleModuleResults($id)
|
public function handleModuleResults($id)
|
||||||
|
|
Loading…
Reference in New Issue