tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1206-Problemas_Consola_Visual_rev2' into 'develop' 

fixed errors visual console

See merge request !727
This commit is contained in:
vgilc 2017-08-11 09:33:42 +02:00
parent 941341585e 33ccab173e
commit ac2d555df8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -412,7 +412,9 @@ function update_button_palette_callback() {
return; return;
} }
$("#" + idItem).html(values['label']); $("#" + idItem).html(values['label']);
if(values['label'].replace( /<.*?>/g, '' ) == '_VALUE_'){ if( (values['label'].replace( /<.*?>/g, '' ) != '_VALUE_')
&& (values['label'].replace( /<.*?>/g, '' ) != '(_VALUE_)') ){
$("#text_" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">'); $("#text_" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">');
$("#" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">'); $("#" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">');
} }
@ -2751,8 +2753,6 @@ function updateDB(type, idElement , values, event) {
update_user_line(type, idElement, top, left); update_user_line(type, idElement, top, left);
break; break;
default: default:
console.log(values);
console.log(idElement);
if ((typeof(values['mov_left']) != 'undefined') && if ((typeof(values['mov_left']) != 'undefined') &&
(typeof(values['mov_top']) != 'undefined')) { (typeof(values['mov_top']) != 'undefined')) {
top = parseInt($("#" + idElement) top = parseInt($("#" + idElement)

5
pandora_console/include/functions_visual_map.php
View File

@ -1547,7 +1547,10 @@ function visual_map_print_item($mode = "read", $layoutData,
} }
else{ 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); echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
} }
else{ else{