From 4ef0c6cd5ff58d736e7812619fbf8b06bc4ffe27 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 24 Oct 2017 18:14:57 +0200 Subject: [PATCH] fixed errors visual console --- .../include/ajax/visual_console_builder.ajax.php | 6 ++++++ pandora_console/include/functions_visual_map.php | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index e5e3ac546e..f1e3d43350 100755 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -967,12 +967,18 @@ switch ($action) { case 'label': $values['type'] = LABEL; $values['label'] = $label; + if(defined('METACONSOLE') && $values['id_agent'] == 0){ + $values['id_metaconsole'] = 1; + } break; case 'icon': $values['type'] = ICON; $values['image'] = $image; $values['width'] = $width; $values['height'] = $height; + if(defined('METACONSOLE') && $values['id_agent'] == 0){ + $values['id_metaconsole'] = 1; + } break; default: if (enterprise_installed()) { diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index f82a22d4c1..be50812cc5 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -510,15 +510,20 @@ function visual_map_print_item($mode = "read", $layoutData, case LABEL: if ($layoutData['id_layout_linked'] != 0) { // Link to a map - $url = $config['homeurl'] . - 'index.php?sec=reporting&sec2=operation/visual_console/render_view&pure='.$config["pure"].'&id='.$layoutData["id_layout_linked"]; + if ($layoutData['id_metaconsole'] == 0) { + $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=0&id_visualmap=" . $layoutData["id_layout_linked"] . "&refr=0"; + } } break; case ICON: $url_icon = ""; if ($layoutData['id_layout_linked'] != 0) { // Link to a map - if (empty($layoutData['id_metaconsole'])) { + if ($layoutData['id_metaconsole'] == 0) { $url = 'index.php?sec=reporting&sec2=operation/visual_console/render_view&pure='.$config["pure"].'&id='.$layoutData["id_layout_linked"]; } else {