mirror of https://github.com/MISP/MISP
fix: [merge] Local tags should stay local vol. 2
parent
e716df5259
commit
ddd5673f86
|
@ -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>
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue