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

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

View File

@ -1544,13 +1544,14 @@ 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 (data['linked_layout_node_id'] == null) { if (val != 0) {
$("select[name=map_linked]").val(val).change(); if (data['linked_layout_node_id'] == null) {
} $("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')