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

Fixed somethings in the arrows.

This commit is contained in:
mdtrooper 2016-04-07 14:20:27 +02:00
parent 1edc4674e2
commit 3b85e3c80f
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/ajax/map.ajax.php
View File

@ -43,13 +43,13 @@ if (is_ajax ()) {
$status = modules_get_agentmodule_status($arrow['to_module']); $status = modules_get_agentmodule_status($arrow['to_module']);
else else
$status = null; $status = null;
$temp['to_status'] = 2; //$status; $temp['to_status'] = $status;
if (!empty($arrow['to_module'])) if (!empty($arrow['to_module']))
$status = modules_get_agentmodule_status($arrow['to_module']); $status = modules_get_agentmodule_status($arrow['to_module']);
else else
$status = null; $status = null;
$temp['from_status'] = 2; //$status; $temp['from_status'] = $status;
$temp['graph_id'] = $arrow['graph_id']; $temp['graph_id'] = $arrow['graph_id'];

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

@ -343,9 +343,7 @@ MapController.prototype.get_arrow_from_id = function(id) {
return null; return null;
} }
else { else {
arrow = arrow[0]; return arrow[0];
return self.get_arrow(arrow['to'], arrow['from']);
} }
} }
@ -2880,6 +2878,4 @@ function update_node(data_graph_id) {
case 'square': case 'square':
break; break;
} }
console.log(new_label, new_shape);
} }

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

@ -104,7 +104,11 @@ NetworkmapController.prototype.get_arrow_AMMA = function(id_to, id_from) {
if (arrow_to !== null && arrow_from !== null) { if (arrow_to !== null && arrow_from !== null) {
// There is one arrow for A-M-M-A // There is one arrow for A-M-M-A
arrow_to = self.get_arrow_from_id(arrow_to['graph_id']); arrow_to = self.get_arrow_from_id(arrow_to['graph_id']);
arrow_to = self.get_arrow(
arrow_to['to'], arrow_to['from']);
arrow_from = self.get_arrow_from_id(arrow_from['graph_id']); arrow_from = self.get_arrow_from_id(arrow_from['graph_id']);
arrow_from = self.get_arrow(
arrow_from['to'], arrow_from['from']);
arrow['graph_id'] = arrow_to['arrow']['graph_id'] + "" + arrow['graph_id'] = arrow_to['arrow']['graph_id'] + "" +
arrow_MM['arrow']['graph_id'] + "" + arrow_MM['arrow']['graph_id'] + "" +
@ -176,13 +180,15 @@ NetworkmapController.prototype.get_arrows_AMA = function(id_to, id_from) {
var type_to = self.get_node_type(edge['to']); var type_to = self.get_node_type(edge['to']);
var type_from = self.get_node_type(edge['from']); var type_from = self.get_node_type(edge['from']);
// Filter M-M edge // Filter M-M edge
if ((type_to != ITEM_TYPE_MODULE_NETWORKMAP) if ((type_to != ITEM_TYPE_MODULE_NETWORKMAP)
|| (type_from != ITEM_TYPE_MODULE_NETWORKMAP)) { || (type_from != ITEM_TYPE_MODULE_NETWORKMAP)) {
var arrow = self.get_arrow_from_id(edge['graph_id']); var arrow = self.get_arrow_from_id(edge['graph_id']);
arrow = self.get_arrow(
arrow['to'], arrow['from']);
var temp = {}; var temp = {};
temp['graph_id'] = temp['graph_id'] =
@ -380,6 +386,8 @@ NetworkmapController.prototype.update_node = function(id) {
} }
NetworkmapController.prototype.update_arrow = function(graph_id) { NetworkmapController.prototype.update_arrow = function(graph_id) {
var self = this;
var arrow = self.get_arrow_from_id(graph_id); var arrow = self.get_arrow_from_id(graph_id);
if ((arrow['type'] == "AMA") || (arrow['type'] == "AMMA")) { if ((arrow['type'] == "AMA") || (arrow['type'] == "AMMA")) {
@ -1850,7 +1858,7 @@ NetworkmapController.prototype.refresh_arrows = function() {
var params = {}; var params = {};
params["refresh_arrows_open"] = 1; params["refresh_arrows_open"] = 1;
params["id_map"] = self._id; params["id_map"] = self._id;
params["page"] = "include/ajax/map.ajax2"; params["page"] = "include/ajax/map.ajax";
var arrows_AMA_or_AMMA = $.grep(edges, var arrows_AMA_or_AMMA = $.grep(edges,
function(edge) { function(edge) {