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

fix: [events:queryEnrichment] Recovers tag colour 

- Fix #6186
pull/6001/head
mokaddem 2020-08-10 10:38:28 +02:00
parent d1301d02dd
commit 1233a88783
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,14 @@ function stringToRGB(str){
return "#" + "00000".substring(0, 6 - c.length) + c;
}
function rgb2hex(rgb) {
rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
function hex(x) {
return ("0" + parseInt(x).toString(16)).slice(-2);
}
return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
}
function xhrFailCallback(xhr) {
if (xhr.status === 403) {
showMessage('fail', 'Not allowed.');
@ -2764,7 +2772,10 @@ function moduleResultsSubmit(id) {
if ($(this).find('.objectAttributeTagContainer').length) {
var tags = [];
$(this).find('.objectAttributeTag').each(function() {
tags.push({name: $(this).attr('title')});
tags.push({
name: $(this).attr('title'),
colour: rgb2hex($(this).css('background-color'))
});
});
attribute['Tag'] = tags;
}
@ -2820,7 +2831,10 @@ function moduleResultsSubmit(id) {
if ($(this).find('.attributeTagContainer').length) {
var tags = [];
$(this).find('.attributeTag').each(function() {
tags.push({name: $(this).attr('title')});
tags.push({
name: $(this).attr('title'),
colour: rgb2hex($(this).css('background-color'))
});
});
temp['Tag'] = tags;
}