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

Merge remote-tracking branch 'origin/2.4' into develop

pull/7614/head
mokaddem 2021-07-29 13:46:36 +02:00
parent 7ac9cae7b6 af50add824
commit 6003aaee27
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/View/Elements/GalaxyClusters/view_relation_tree.ctp
View File

@ -299,7 +299,7 @@ $randomClass = "relation-{$random}";
.attr("class", "well well-small")
.style('padding', '4px 9px')
.style('white-space', 'nowrap')
.html(function(d) { return d.Relation.referenced_galaxy_cluster_type; })
.text(function(d) { return d.Relation.referenced_galaxy_cluster_type; })
paddingX = 8;
gEnter.append("foreignObject")
@ -319,7 +319,7 @@ $randomClass = "relation-{$random}";
.style('background-color', tag.colour)
.style('color', getTextColour(tag.colour))
.style('display', 'inline')
.html(tag.name)
.text(tag.name)
});
}
});

2
app/View/GalaxyElements/ajax/index.ctp
View File

@ -83,7 +83,7 @@ if ($context == 'JSONView') {
echo $this->element('/genericElements/IndexTable/index_table', $indexOptions);
if ($context == 'JSONView') {
echo sprintf('<div id="elementJSONDiv" class="well well-small">%s</div>', json_encode($JSONElements));
echo sprintf('<div id="elementJSONDiv" class="well well-small">%s</div>', json_encode(h($JSONElements)));
}
?>