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

Merge branch '2041-No-funcionan-mapas-de-red-dev' into 'develop' 

Fixed target and source undefined

See merge request artica/pandorafms!1396
This commit is contained in:
vgilc 2018-03-27 17:32:22 +02:00
parent 985a7eec97 8b3ec8146d
commit e8e8b0ac03
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_pandora_networkmap.php
View File

@ -39,7 +39,7 @@ function networkmap_process_networkmap($id = 0) {
$numNodes = (int)db_get_num_rows('
SELECT *
FROM titem
WHERE id_map = ' . $id . ';');
WHERE id_map = ' . $id . ' and deleted = 0');
$networkmap = db_get_row_filter('tmap',
array('id' => $id));
@ -836,6 +836,11 @@ function networkmap_links_to_js_links($relations, $nodes_graph) {
$item['source'] = $node['id'];
}
}
if (($item['target'] == -1) && ($item['source'] == -1) && $relation['parent_type'] == 1 && $relation['child_type'] == 1) {
continue;
}
$return[] = $item;
}
return $return;