From 9f12469edf938bc99ed40e32b400b02c7537acd5 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 13 Jan 2015 12:50:13 +0100 Subject: [PATCH] Fixed the item group in visual consoles that links other visualmap. TICKET: #1647 --- .../include/functions_visual_map.php | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index ce9845a0d5..79f578268f 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -335,10 +335,10 @@ function visual_map_print_item($mode = "read", $layoutData, } else if ($is_a_link_to_other_visualconsole) { if (empty($layout_data['id_metaconsole'])) { - $url_vc = $config['homeurl'] . "index.php?sec=reporting&sec2=operation/visual_console/render_view&pure=" . $config["pure"] . "&id=" . $layout_data["id_layout_linked"]; + $url = $config['homeurl'] . "index.php?sec=reporting&sec2=operation/visual_console/render_view&pure=" . $config["pure"] . "&id=" . $layoutData["id_layout_linked"]; } else { - $url_vc = "index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=1&id_visualmap=" . $layout_data["id_layout_linked"] . "&refr=0"; + $url = "index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=1&id_visualmap=" . $layoutData["id_layout_linked"] . "&refr=0"; } } else { @@ -371,9 +371,24 @@ function visual_map_print_item($mode = "read", $layoutData, break; case GROUP_ITEM: - $url = $config['homeurl'] . - 'index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=' . - $layoutData['id_group']; + $is_a_link_to_other_visualconsole = false; + if ($layoutData['id_layout_linked'] != 0) { + $is_a_link_to_other_visualconsole = true; + } + + if ($is_a_link_to_other_visualconsole) { + if (empty($layout_data['id_metaconsole'])) { + $url = $config['homeurl'] . "index.php?sec=reporting&sec2=operation/visual_console/render_view&pure=" . $config["pure"] . "&id=" . $layoutData["id_layout_linked"]; + } + else { + $url = "index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=1&id_visualmap=" . $layoutData["id_layout_linked"] . "&refr=0"; + } + } + else { + $url = $config['homeurl'] . + 'index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=' . + $layoutData['id_group']; + } break; case LABEL: if ($layoutData['id_layout_linked'] != 0) {