tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-25 19:09:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2897-Fallo-al-hacer-update-en-Visual-Consoles-dev' into 'develop'

Browse Source 
Fixed lost id_agent in visual console

See merge request artica/pandorafms!1858
This commit is contained in:
vgilc 2018-10-16 09:00:48 +02:00
commit 3664099fca
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1544,15 +1544,16 @@ function loadFieldsFromDB(item) {
if (key == 'linked_layout_status_type') if (key == 'linked_layout_status_type')
$("select[name=linked_map_status_calculation_type]").val(val).change(); $("select[name=linked_map_status_calculation_type]").val(val).change();
if (key == 'id_layout_linked') { if (key == 'id_layout_linked') {
if (val != 0) {
if (data['linked_layout_node_id'] == null) { if (data['linked_layout_node_id'] == null) {
$("select[name=map_linked]").val(val).change(); $("select[name=map_linked]").val(val).change();
} } else {
else {
var $option = $("select[name=map_linked] > option[data-node-id=" + data['linked_layout_node_id'] + "][value=" + val + "]"); var $option = $("select[name=map_linked] > option[data-node-id=" + data['linked_layout_node_id'] + "][value=" + val + "]");
if ($option.length === 0) $option = $("select[name=map_linked] > option[value=" + val + "]"); if ($option.length === 0) $option = $("select[name=map_linked] > option[value=" + val + "]");
$option.prop("selected", true).parent().change(); $option.prop("selected", true).parent().change();
} }
} }
}
if (key == 'linked_layout_node_id') if (key == 'linked_layout_node_id')
$("input[name=linked_map_node_id]").val(val); $("input[name=linked_map_node_id]").val(val);
if (key == 'id_layout_linked_weight') if (key == 'id_layout_linked_weight')