tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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) {
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;
}

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

@ -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;