From f2ad7444282ef0cb159da0b76c1632449e29ef74 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez <arturo.gonzalez@artica.es> Date: Tue, 7 Feb 2017 14:45:27 +0100 Subject: [PATCH] Fixed open maps migration. Ticket #231 --- pandora_console/operation/agentes/pandora_networkmap.php | 2 +- .../operation/agentes/pandora_networkmap.view.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php index 8f8d074e20..0038c531e3 100644 --- a/pandora_console/operation/agentes/pandora_networkmap.php +++ b/pandora_console/operation/agentes/pandora_networkmap.php @@ -301,7 +301,7 @@ switch ($tab) { $text_filter = $old_map_open['text_filter']; if ($text_filter != "migrated") { - $open_maps_to_migrate[] = $old_map_open['id']; + $open_maps_to_migrate[] = $old_map_open['id_networkmap']; } } diff --git a/pandora_console/operation/agentes/pandora_networkmap.view.php b/pandora_console/operation/agentes/pandora_networkmap.view.php index c197550795..917224ba5a 100644 --- a/pandora_console/operation/agentes/pandora_networkmap.view.php +++ b/pandora_console/operation/agentes/pandora_networkmap.view.php @@ -654,17 +654,15 @@ if (is_ajax ()) { $old_maps_open = explode(",", $old_maps_open); foreach ($old_maps_open as $id_open_map) { $return = migrate_older_open_maps($id_open_map); + if (!$return) { $return_data['open'] = false; break; } else { - $old_networkmap_open = db_get_row_filter('tnetwork_map', - array('id_networkmap' => $id_open_map)); - $values['text_filter'] = "migrated"; - $return_update = db_process_sql_update('tnetwork_map', $values, array('id_networkmap' => $id_ent_map)); + $return_update = db_process_sql_update('tnetwork_map', $values, array('id_networkmap' => $id_open_map)); if (!$return_update) { $return_data['open'] = false; break;