From 3d6141851942a3e70deeb42529cc255ec3521d1a Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Fri, 15 Apr 2016 12:17:18 +0200 Subject: [PATCH] New maps in progress... (Fixed status in module nodes when "show modules" is disabled) --- .../include/javascript/map/MapController.js | 20 +++++++++- .../javascript/map/NetworkmapController.js | 37 +++++++++++++------ 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/pandora_console/include/javascript/map/MapController.js b/pandora_console/include/javascript/map/MapController.js index 2cf32e46da..00b8777692 100644 --- a/pandora_console/include/javascript/map/MapController.js +++ b/pandora_console/include/javascript/map/MapController.js @@ -1661,14 +1661,32 @@ MapController.prototype.is_draggable = function(node) { switch (node.type) { case ITEM_TYPE_MODULE_NETWORKMAP: + if (filter['show_modules']) { + return_var = true; + } + else { + return_var = false; + } + break; case ITEM_TYPE_MODULEGROUP_NETWORKMAP: + if (filter['show_modules']) { + if (filter['show_module_group']) { + return_var = true; + } + else { + return_var = false; + } + } + else { + return_var = false; + } + break; case ITEM_TYPE_AGENT_NETWORKMAP: case ITEM_TYPE_FICTIONAL_NODE: return_var = true; break; } - return return_var; } diff --git a/pandora_console/include/javascript/map/NetworkmapController.js b/pandora_console/include/javascript/map/NetworkmapController.js index bb3f3ec0f1..c0aab6ed89 100644 --- a/pandora_console/include/javascript/map/NetworkmapController.js +++ b/pandora_console/include/javascript/map/NetworkmapController.js @@ -70,18 +70,21 @@ NetworkmapController.prototype.init_map = function() { } }); } + if (filter['show_modules']) { + if (filter['show_module_group']) { + var arrow_GM = self.get_arrow_GM(edge['to'], edge['from']); + if (arrow_GM !== null) { + if (!self.exists_arrow(clean_arrows, arrow_GM)) { + clean_arrows.push(arrow_GM); + } + } - var arrow_GM = self.get_arrow_GM(edge['to'], edge['from']); - if (arrow_GM !== null) { - if (!self.exists_arrow(clean_arrows, arrow_GM)) { - clean_arrows.push(arrow_GM); - } - } - - var arrow_AG = self.get_arrow_AG(edge['to'], edge['from']); - if (arrow_AG !== null) { - if (!self.exists_arrow(clean_arrows, arrow_AG)) { - clean_arrows.push(arrow_AG); + var arrow_AG = self.get_arrow_AG(edge['to'], edge['from']); + if (arrow_AG !== null) { + if (!self.exists_arrow(clean_arrows, arrow_AG)) { + clean_arrows.push(arrow_AG); + } + } } } }); @@ -141,6 +144,18 @@ NetworkmapController.prototype.filter_only_agents = function(node) { return false; } break; + case ITEM_TYPE_MODULEGROUP_NETWORKMAP: + if (filter['show_modules']) { + if (filter['show_module_group']) { + return true; + } + else { + return false; + } + } + else { + return false; + } default: return true; break;