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

Merge branch 'ent-8441-12953-Estado-de-mapas-de-red-linkados' into 'develop' 

Ent 8441 12953 estado de mapas de red linkados

See merge request artica/pandorafms!4658
This commit is contained in:
Daniel Rodriguez 2022-02-02 09:39:20 +00:00
parent 77289f1775 561589423d
commit 3e24773efa
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1671,12 +1671,17 @@ class NetworkMap
if (isset($source_data['color'])) { if (isset($source_data['color'])) {
$item['color'] = $source_data['color']; $item['color'] = $source_data['color'];
} else {
if (empty($node['status']) && empty($node['id_module']) && !empty($node['style']['id_networkmap'])) {
$status_aux = get_status_color_networkmap_fictional_point($node['style']['id_networkmap']);
$item['color'] = $status_aux;
} else { } else {
$item['color'] = self::getColorByStatus( $item['color'] = self::getColorByStatus(
$node['status'], $node['status'],
(bool) $node['id_module'] (bool) $node['id_module']
); );
} }
}
break; break;
} }

5
pandora_console/include/functions_networkmap.php
View File

@ -3280,7 +3280,10 @@ function get_status_color_networkmap_fictional_point($id_networkmap, $parent='')
if ((int) $id_networkmap !== 0) { if ((int) $id_networkmap !== 0) {
$agents = db_get_all_rows_filter( $agents = db_get_all_rows_filter(
'titem', 'titem',
['id_map' => $id_networkmap] [
'id_map' => $id_networkmap,
'deleted' => 0,
]
); );
if ((bool) $agents === false) { if ((bool) $agents === false) {