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

Fixed the AMMA arrows.

This commit is contained in:
mdtrooper 2016-05-17 10:25:49 +02:00
parent e0403e90b2
commit d4c84ddde2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,10 +287,11 @@ NetworkmapController.prototype.get_arrow_AMMA = function(id_to, id_from) {
//------ END CODE --- get arrows A-M from M-M ------------------ //------ END CODE --- get arrows A-M from M-M ------------------
//-------------------------------------------------------------- //--------------------------------------------------------------
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
// Get arrow with full data (nodes and arrow) // Get arrow with full data (nodes and arrow)
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 = self.get_arrow(
@ -305,8 +306,7 @@ NetworkmapController.prototype.get_arrow_AMMA = function(id_to, id_from) {
arrow_MM['arrow']['graph_id'] + "" + arrow_MM['arrow']['graph_id'] + "" +
arrow_from['arrow']['graph_id']; arrow_from['arrow']['graph_id'];
if (arrow_to['arrow']['from'] == arrow_MM['arrow']['to']) {
if (arrow_to['nodes']['from'] == arrow_MM['arrow']['to']) {
arrow['to'] = arrow_to['nodes']['to']; arrow['to'] = arrow_to['nodes']['to'];
} }
else { else {
@ -316,8 +316,7 @@ NetworkmapController.prototype.get_arrow_AMMA = function(id_to, id_from) {
arrow['to_status'] = arrow_MM['nodes']['to']['status']; arrow['to_status'] = arrow_MM['nodes']['to']['status'];
arrow['to_title'] = arrow_MM['nodes']['to']['title']; arrow['to_title'] = arrow_MM['nodes']['to']['title'];
if (arrow_from['arrow']['to'] == arrow_MM['arrow']['from']) {
if (arrow_from['nodes']['to'] == arrow_MM['arrow']['from']) {
arrow['from'] = arrow_from['nodes']['from']; arrow['from'] = arrow_from['nodes']['from'];
} }
else { else {