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-2588-service-like-visual-console-status' into 'develop' 

Removed the Static Graph requirement for all the status calculation types

See merge request artica/pandorafms!1748
This commit is contained in:
nramon 2018-09-11 15:05:46 +02:00
parent f611b5bc11 2fa2d713b8
commit 266cd6d394
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/functions_visual_map.php
View File

@ -3735,17 +3735,6 @@ function visual_map_get_layout_status ($layout_id, $status_data = array(), $dept
!empty($layout_item_data["id_layout_linked"]) ||
!empty($layout_item_data["id_agente_modulo"]) ||
!empty($layout_item_data["id_agent"])
) && (
// Weight and service types for status calculation require STATIC_GRAPH items
(
$status_data["linked_layout_status_type"] !== "weight" &&
$status_data["linked_layout_status_type"] !== "service"
) || (
$layout_item_data['type'] == STATIC_GRAPH && (
$status_data["linked_layout_status_type"] === "weight" ||
$status_data["linked_layout_status_type"] === "service"
)
)
) &&
// ACL check
check_acl($config["id_user"], $layout_item_data["element_group"], "VR")