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

Former-commit-id: 755d2013c4f25475eb4f38dec9a8974c74f08715

pandora_console/include/class/NetworkMap.class.php

@@ -1616,6 +1616,16 @@ class NetworkMap
 
             if (is_array($node['style']) === false) {
                 $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.
@@ -2722,6 +2732,7 @@ class NetworkMap
         }
 
         $this->nodesJS = $this->nodesToJS($nodes);
+
         $output .= 'networkmap.nodes = ('.json_encode($this->nodesJS).");\n";
 
         // Clean.