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

Merge branch 'ent-3802-visual-constole-warning-state-bug' into 'develop' 

Fixed select bug not selectig value

See merge request artica/pandorafms!2346
This commit is contained in:
Daniel Rodriguez 2019-05-08 13:17:02 +02:00
parent 247605f308 ef1149d3bb
commit f13162abf1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_visual_map.php
View File

@ -4094,10 +4094,8 @@ function visual_map_get_layout_status($layout_id, $status_data=[], $depth=0)
);
} else if (!empty($layout_item_data['id_agent'])) {
// Agent.
$agent_status = agents_get_status(
$layout_item_data['id_agent'],
true
);
$agent = db_get_row('tagente', 'id_agente', $layout_item_data['id_agent']);
$agent_status = agents_get_status_from_counts($agent);
$status = visual_map_translate_agent_status(
$agent_status
);

3
pandora_console/include/functions_visual_map_editor.php
View File

@ -1394,6 +1394,9 @@ function visual_map_editor_print_hack_translate_strings()
<script type="text/javascript">
$(document).ready (function () {
$("#map_linked").change(function () {
$("option[value=" + this.value + "]", this)
.attr("selected", true).siblings()
.removeAttr("selected")
$("#text-agent").val("");
$("input[name=id_agent]").val(0);
$("#module").empty();