From c44593be8aa5c01e291a272f527293c85894cf67 Mon Sep 17 00:00:00 2001 From: Calvo Date: Tue, 6 Jul 2021 10:14:59 +0200 Subject: [PATCH 1/2] Revomved autorefresh views than does not exists on meta --- pandora_console/operation/users/user_edit.php | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index 5a944f81b1..7b0b73d703 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -438,24 +438,26 @@ if (is_metaconsole()) { } else { $autorefresh_list_out['operation/agentes/tactical'] = 'Tactical view'; $autorefresh_list_out['operation/agentes/group_view'] = 'Group view'; + $autorefresh_list_out['operation/agentes/estado_agente'] = 'Agent detail'; + $autorefresh_list_out['operation/agentes/alerts_status'] = 'Alert detail'; + $autorefresh_list_out['enterprise/operation/cluster/cluster'] = 'Cluster view'; + $autorefresh_list_out['operation/gis_maps/render_view'] = 'Gis Map'; + $autorefresh_list_out['operation/reporting/graph_viewer'] = 'Graph Viewer'; + $autorefresh_list_out['operation/snmpconsole/snmp_view'] = 'SNMP console'; + + if (enterprise_installed()) { + $autorefresh_list_out['general/sap_view'] = 'SAP view'; + } } -$autorefresh_list_out['operation/agentes/estado_agente'] = 'Agent detail'; -$autorefresh_list_out['operation/agentes/alerts_status'] = 'Alert detail'; $autorefresh_list_out['operation/agentes/status_monitor'] = 'Monitor detail'; -$autorefresh_list_out['operation/operation/services/services'] = 'Services'; +$autorefresh_list_out['enterprise/operation/services/services'] = 'Services'; $autorefresh_list_out['operation/dashboard/dashboard'] = 'Dashboard'; -$autorefresh_list_out['operation/reporting/graph_viewer'] = 'Graph Viewer'; -$autorefresh_list_out['operation/gis_maps/render_view'] = 'Gis Map'; -$autorefresh_list_out['operation/snmpconsole/snmp_view'] = 'SNMP console'; $autorefresh_list_out['operation/agentes/pandora_networkmap'] = 'Network map'; $autorefresh_list_out['operation/visual_console/render_view'] = 'Visual console'; $autorefresh_list_out['operation/events/events'] = 'Events'; -$autorefresh_list_out['enterprise/operation/cluster/cluster'] = 'Cluster view'; -if (enterprise_installed()) { - $autorefresh_list_out['general/sap_view'] = 'SAP view'; -} + if (!isset($autorefresh_list)) { $select = db_process_sql("SELECT autorefresh_white_list FROM tusuario WHERE id_user = '".$config['id_user']."'"); From 8eababe2f6df2bdc3696e86436b0a0465b65cf2d Mon Sep 17 00:00:00 2001 From: Calvo Date: Wed, 22 Sep 2021 17:29:14 +0200 Subject: [PATCH 2/2] Autorefresh changes on centralized node and metaconsole --- pandora_console/operation/users/user_edit.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index 88e34a4ca0..40b898fae2 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -445,12 +445,7 @@ if (check_acl($config['id_user'], 0, 'ER')) { $autorefresh_list_out = []; -if (is_metaconsole()) { - $autorefresh_list_out['monitoring/tactical'] = 'Tactical view'; - $autorefresh_list_out['monitoring/group_view'] = 'Group view'; -} else { - $autorefresh_list_out['operation/agentes/tactical'] = 'Tactical view'; - $autorefresh_list_out['operation/agentes/group_view'] = 'Group view'; +if (is_metaconsole() === false || is_centrallised() === true) { $autorefresh_list_out['operation/agentes/estado_agente'] = 'Agent detail'; $autorefresh_list_out['operation/agentes/alerts_status'] = 'Alert detail'; $autorefresh_list_out['enterprise/operation/cluster/cluster'] = 'Cluster view'; @@ -463,6 +458,8 @@ if (is_metaconsole()) { } } +$autorefresh_list_out['operation/agentes/tactical'] = 'Tactical view'; +$autorefresh_list_out['operation/agentes/group_view'] = 'Group view'; $autorefresh_list_out['operation/agentes/status_monitor'] = 'Monitor detail'; $autorefresh_list_out['enterprise/operation/services/services'] = 'Services'; $autorefresh_list_out['operation/dashboard/dashboard'] = 'Dashboard';