Fixed color of fictional node
This commit is contained in:
parent
4da16bedf8
commit
561589423d
|
@ -1672,10 +1672,15 @@ class NetworkMap
|
||||||
if (isset($source_data['color'])) {
|
if (isset($source_data['color'])) {
|
||||||
$item['color'] = $source_data['color'];
|
$item['color'] = $source_data['color'];
|
||||||
} else {
|
} else {
|
||||||
$item['color'] = self::getColorByStatus(
|
if (empty($node['status']) && empty($node['id_module']) && !empty($node['style']['id_networkmap'])) {
|
||||||
$node['status'],
|
$status_aux = get_status_color_networkmap_fictional_point($node['style']['id_networkmap']);
|
||||||
(bool) $node['id_module']
|
$item['color'] = $status_aux;
|
||||||
);
|
} else {
|
||||||
|
$item['color'] = self::getColorByStatus(
|
||||||
|
$node['status'],
|
||||||
|
(bool) $node['id_module']
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
Loading…
Reference in New Issue