From 06d47e03db47567f4a854e37cc9605ea597d32da Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Thu, 16 Nov 2017 12:03:20 +0100 Subject: [PATCH 1/2] Added dinamic to new flow --- .../operation/agentes/networkmap.dinamic.php | 18 +++++++++++++++++- .../operation/agentes/pandora_networkmap.php | 10 +++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/agentes/networkmap.dinamic.php b/pandora_console/operation/agentes/networkmap.dinamic.php index c2fdf605a2..01b0e54bc6 100644 --- a/pandora_console/operation/agentes/networkmap.dinamic.php +++ b/pandora_console/operation/agentes/networkmap.dinamic.php @@ -18,7 +18,13 @@ global $config; check_login (); -$id = get_parameter('id_networkmap', true); +if (_id_ != "_id_") { + $id = _id_; +} +else { + $id = get_parameter('id_networkmap', true); +} + $activeTab = get_parameter('activeTab', true); if (enterprise_installed()) { @@ -31,6 +37,11 @@ if (enterprise_installed()) { } } +if (_activeTab_ != "_activeTab_") { + $activeTab = _activeTab_; + $tab = $activeTab; +} + // Networkmap id required if (!isset($id)) { db_pandora_audit("ACL Violation", @@ -107,6 +118,11 @@ ui_print_page_header(io_safe_output($networkmap['name']), global $width; global $height; +if (_id_ != "_id_") { + $width = array(); + $height = array(); +} + if (empty($width)) { $width = 600; } diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php index 4c8eb13af2..8cd2af3f84 100644 --- a/pandora_console/operation/agentes/pandora_networkmap.php +++ b/pandora_console/operation/agentes/pandora_networkmap.php @@ -290,8 +290,13 @@ if ($new_networkmap || $save_networkmap) { $id = $result; define("_id_", $id); - // Force the tab = 'view' + $tab = "view"; + + if ($values['generation_method'] == 6) { + $tab = "r_dinamic"; + define("_activeTab_", 'radial_dynamic'); + } } } // The networkmap exists @@ -433,6 +438,9 @@ else if ($update_networkmap || $copy_networkmap || $delete) { } switch ($tab) { + case 'r_dinamic': + require('networkmap.dinamic.php'); + break; case 'edit': require('pandora_networkmap.editor.php'); break; From f665fe9d07526b2471a844a94271928b5818c86d Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Thu, 16 Nov 2017 12:10:37 +0100 Subject: [PATCH 2/2] Added empty maps to flow --- pandora_console/operation/agentes/pandora_networkmap.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php index 8cd2af3f84..53478a65c5 100644 --- a/pandora_console/operation/agentes/pandora_networkmap.php +++ b/pandora_console/operation/agentes/pandora_networkmap.php @@ -112,8 +112,10 @@ if (enterprise_installed()) { __('Succesfully created'), __('Could not be created'), '', true); - // Force the tab = 'list' - $tab = "list"; + $id = $result; + define("_id_", $id); + + $tab = "view"; } else if ($update_empty_networkmap) { $id_group = (int) get_parameter('id_group', 0);