tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-3674-discovery-fase-3' of brutus.artica.lan:artica/pandorafms into ent-3674-discovery-fase-3

Browse Source 
Former-commit-id: 755d2013c4f25475eb4f38dec9a8974c74f08715
This commit is contained in:
fbsanchez 2019-04-05 17:20:50 +02:00
commit 8e00fdebb4
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/class/NetworkMap.class.php
View File

@ -1616,6 +1616,16 @@ class NetworkMap
if (is_array($node['style']) === false) { if (is_array($node['style']) === false) {
$node['style'] = json_decode($node['style'], true); $node['style'] = json_decode($node['style'], true);
// Add styles.
if (isset($source_data['style']) === true
&& is_array($source_data['style']) === true
) {
$node['style'] = array_merge(
$node['style'],
$source_data['style']
);
}
} }
// Propagate styles. // Propagate styles.
@ -2722,6 +2732,7 @@ class NetworkMap
} }
$this->nodesJS = $this->nodesToJS($nodes); $this->nodesJS = $this->nodesToJS($nodes);
$output .= 'networkmap.nodes = ('.json_encode($this->nodesJS).");\n"; $output .= 'networkmap.nodes = ('.json_encode($this->nodesJS).");\n";
// Clean. // Clean.