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

Merge branch '1240-fictional-node-link-to-other-map-dev' into 'develop' 

Added function to update link to other map

See merge request artica/pandorafms!990
This commit is contained in:
vgilc 2017-11-15 09:45:03 +01:00
parent 8ebada6dbf 74753918c3
commit faac4fa46f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/include/functions_pandora_networkmap.php
View File

@ -212,6 +212,7 @@ function networkmap_process_networkmap($id = 0) {
$style['width'] = $node['width'];
$style['height'] = $node['height'];
$style['label'] = $node['text'];
$style['id_networkmap'] = $node['networkmap'];
$nodes_and_relations['nodes'][$index]['style'] = json_encode($style);
$index++;
@ -400,6 +401,13 @@ function networkmap_db_node_to_js_node($node, &$count, &$count_item_holding_area
$item['map_id'] = $node['id_map'];
}
if (!isset($node['style']['id_networkmap']) || $node['style']['id_networkmap'] == '' || $node['style']['id_networkmap'] == 0) {
$item['networkmap_id'] = 0;
}
else {
$item['networkmap_id'] = $node['style']['id_networkmap'];
}
$count++;
return $item;