diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index ee2c23c5de..00d86be5a1 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -412,7 +412,9 @@ function update_button_palette_callback() { return; } $("#" + idItem).html(values['label']); - if(values['label'].replace( /<.*?>/g, '' ) == '_VALUE_'){ + if( (values['label'].replace( /<.*?>/g, '' ) != '_VALUE_') + && (values['label'].replace( /<.*?>/g, '' ) != '(_VALUE_)') ){ + $("#text_" + idItem).html(''); $("#" + idItem).html(''); } @@ -2751,8 +2753,6 @@ function updateDB(type, idElement , values, event) { update_user_line(type, idElement, top, left); break; default: - console.log(values); - console.log(idElement); if ((typeof(values['mov_left']) != 'undefined') && (typeof(values['mov_top']) != 'undefined')) { top = parseInt($("#" + idElement) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index e88c1ffe02..3ea05cc8b1 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1547,7 +1547,10 @@ function visual_map_print_item($mode = "read", $layoutData, } else{ - if(strip_tags($io_safe_output_text) != '_VALUE_'){ + if(strip_tags($io_safe_output_text) == '_VALUE_'){ + echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text); + } + elseif(strip_tags($io_safe_output_text) == '(_VALUE_)'){ echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text); } else{