tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-09-26 03:19:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

New maps in progress... (Fixed status in module nodes when "show modules" is disabled)

Browse Source
This commit is contained in:
Arturo Gonzalez 2016-04-15 12:17:18 +02:00
parent 8daff7d978
commit 3d61418519
2 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/include/javascript/map/MapController.js
View File

@ -1661,14 +1661,32 @@ MapController.prototype.is_draggable = function(node) {
switch (node.type) { switch (node.type) {
case ITEM_TYPE_MODULE_NETWORKMAP: case ITEM_TYPE_MODULE_NETWORKMAP:
if (filter['show_modules']) {
return_var = true;
}
else {
return_var = false;
}
break;
case ITEM_TYPE_MODULEGROUP_NETWORKMAP: 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_AGENT_NETWORKMAP:
case ITEM_TYPE_FICTIONAL_NODE: case ITEM_TYPE_FICTIONAL_NODE:
return_var = true; return_var = true;
break; break;
} }
return return_var; return return_var;
} }

17
pandora_console/include/javascript/map/NetworkmapController.js
View File

@ -70,7 +70,8 @@ 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']); var arrow_GM = self.get_arrow_GM(edge['to'], edge['from']);
if (arrow_GM !== null) { if (arrow_GM !== null) {
if (!self.exists_arrow(clean_arrows, arrow_GM)) { if (!self.exists_arrow(clean_arrows, arrow_GM)) {
@ -84,6 +85,8 @@ NetworkmapController.prototype.init_map = function() {
clean_arrows.push(arrow_AG); clean_arrows.push(arrow_AG);
} }
} }
}
}
}); });
clean_arrows.forEach(function(arrow, index) { clean_arrows.forEach(function(arrow, index) {
@ -141,6 +144,18 @@ NetworkmapController.prototype.filter_only_agents = function(node) {
return false; return false;
} }
break; break;
case ITEM_TYPE_MODULEGROUP_NETWORKMAP:
if (filter['show_modules']) {
if (filter['show_module_group']) {
return true;
}
else {
return false;
}
}
else {
return false;
}
default: default:
return true; return true;
break; break;