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

chg: [event:EventFilteringTool] Display active filtering rules 

(tags/galaxies) even if not available

Due to a recent performance fix, only tags and galaxies of the event are
shown, the rule is still displayed event if not matching attributes are
found
pull/4492/head
mokaddem 2019-04-16 11:25:16 +02:00
parent 16453a3433
commit 29f4b25f5a
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/View/Elements/Events/View/eventFilteringQueryBuilder.ctp
View File

@ -197,7 +197,12 @@ function triggerEventFilteringTool(clicked) {
2: "Doesn\'t have sighting(s)"
}
},
<?php if (!empty($attributeTags)): ?>
<?php
if (empty($attributeTags) && isset($filters['taggedAttributes'])) {
$attributeTags = array(htmlspecialchars($filters['taggedAttributes']));
}
if (!empty($attributeTags)):
?>
{
"input": "select",
"type": "string",
@ -210,7 +215,12 @@ function triggerEventFilteringTool(clicked) {
"values": <?php echo json_encode(array_map("htmlspecialchars", $attributeTags)); ?>
},
<?php endif; ?>
<?php if (!empty($attributeClusters)): ?>
<?php
if (empty($attributeClusters) && isset($filters['galaxyAttachedAttributes'])) {
$attributeClusters = array(htmlspecialchars($filters['galaxyAttachedAttributes']));
}
if (!empty($attributeClusters)):
?>
{
"input": "select",
"type": "string",
@ -339,12 +349,14 @@ function triggerEventFilteringTool(clicked) {
{
field: 'taggedAttributes',
id: 'taggedAttributes',
value: '<?php echo isset($filters['taggedAttributes']) ? h($filters['taggedAttributes']) : $attributeTags[0]; ?>'
},
<?php endif; ?>
<?php if (!empty($attributeClusters) && (count($advancedFilteringActiveRules) == 0 || isset($advancedFilteringActiveRules['galaxyAttachedAttributes']))): ?>
{
field: 'galaxyAttachedAttributes',
id: 'galaxyAttachedAttributes',
value: '<?php echo isset($filters['galaxyAttachedAttributes']) ? h($filters['galaxyAttachedAttributes']) : $attributeClusters[0]; ?>'
},
<?php endif; ?>
],