From 36fda7a23df8718ffa7aa95a2a303fdbab505add Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Tue, 14 Mar 2017 12:24:03 +0100 Subject: [PATCH] Added interface modules to db (to next relations with this interfaces) --- .../include/functions_networkmap.php | 5 ----- .../javascript/functions_pandora_networkmap.js | 17 ----------------- 2 files changed, 22 deletions(-) diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php index 651255f509..c775ef0329 100644 --- a/pandora_console/include/functions_networkmap.php +++ b/pandora_console/include/functions_networkmap.php @@ -407,10 +407,6 @@ function networkmap_generate_dot ($pandora_name, $group = 0, // Try to get the interface name if (preg_match ("/(.+)_ifOperStatus$/" , (string)$module['nombre'], $matches)) { if ($matches[1]) { - $have_relations_a = db_get_value('id', 'tmodule_relationship', 'module_a', $module['id_agente_modulo']); - $have_relations_b = db_get_value('id', 'tmodule_relationship', 'module_b', $module['id_agente_modulo']); - - if ($have_relations_a || $have_relations_b) { $module['nombre'] = $matches[1]; // Save node parent information to define edges later @@ -418,7 +414,6 @@ function networkmap_generate_dot ($pandora_name, $group = 0, // Add node $nodes[$node_count] = $module; - } } } else { diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js index a35025bc25..c0742e65d4 100644 --- a/pandora_console/include/javascript/functions_pandora_networkmap.js +++ b/pandora_console/include/javascript/functions_pandora_networkmap.js @@ -1876,23 +1876,6 @@ function add_interface_link_js () { }); graph.links.push(temp_link); - - $("#layer_graph_links_" + networkmap_id).remove(); - $("#layer_graph_nodes_" + networkmap_id).remove(); - - window.layer_graph_links = window.layer_graph - .append("g") - .attr("id", "layer_graph_links_" + networkmap_id); - window.layer_graph_nodes = window.layer_graph - .append("g") - .attr("id", "layer_graph_nodes_" + networkmap_id); - - force.nodes(graph.nodes) - .links(graph.links) - .start(); - - window.node = layer_graph_nodes.selectAll(".node"); - window.link = layer_graph_links.selectAll(".link"); draw_elements_graph(); init_drag_and_drop();