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

Merge pull request #7183 from JakubOnderka/merge-local-tags-v2 

fix: [merge] Local tags should stay local vol. 2
pull/7081/head
Jakub Onderka 2021-03-18 20:54:02 +01:00 committed by GitHub
parent 0b0b71e8f5 ddd5673f86
commit d4b0f265bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 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

@ -280,7 +280,7 @@
?>
<span style="display:inline-block;">
<span style="padding:1px;display:flex;white-space:nowrap;margin-right:2px;word-wrap:break-word;">
<span class="objectAttributeTag" style="display:inline-block;background-color:<?php echo h($color); ?>;color:white;" title="<?php echo h($tag['name']); ?>">
<span class="objectAttributeTag" data-local="<?= !empty($tag['local']) ? 1 : 0 ?>" style="display:inline-block;background-color:<?php echo h($color); ?>;color:white;" title="<?php echo h($tag['name']); ?>">
<?php echo h($tagText); ?>
</span>
</span>
@ -390,7 +390,7 @@
?>
<span style="display:inline-block;">
<span style="padding:1px;display:flex;white-space:nowrap;margin-right:2px;word-wrap:break-word;">
<span class="attributeTag" style="display:inline-block;background-color:<?php echo h($color); ?>;color:white;" title="<?php echo h($tag['name']); ?>">
<span class="attributeTag" data-local="<?= !empty($tag['local']) ? 1 : 0 ?>" style="display:inline-block;background-color:<?php echo h($color); ?>;color:white;" title="<?php echo h($tag['name']); ?>">
<?php echo h($tagText); ?>
</span>
</span>

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

@ -2841,7 +2841,8 @@ function moduleResultsSubmit(id) {
$(this).find('.objectAttributeTag').each(function() {
tags.push({
name: $(this).attr('title'),
colour: rgb2hex($(this).css('background-color'))
colour: rgb2hex($(this).css('background-color')),
local: $(this).data('local'),
});
});
attribute['Tag'] = tags;
@ -2900,7 +2901,8 @@ function moduleResultsSubmit(id) {
$(this).find('.attributeTag').each(function() {
tags.push({
name: $(this).attr('title'),
colour: rgb2hex($(this).css('background-color'))
colour: rgb2hex($(this).css('background-color')),
local: $(this).data('local'),
});
});
temp['Tag'] = tags;