From 9dbc693d2bf7432cc1c064ee7e3311d2cfded167 Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Thu, 7 Mar 2019 16:50:36 +0100 Subject: [PATCH 1/3] Arreglado leyenda Former-commit-id: eb893efbb586d0852531e9e52fe2e1c9ee64d010 --- pandora_console/include/functions_graph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 71049d7804..bf28373284 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1834,7 +1834,7 @@ function graphic_combined_module( $label = $params_combined['labels'][$module]; } else { $alias = db_get_value('alias', 'tagente', 'id_agente', $module_data['id_agente']); - $label = $alias.' - '.$module_data['nombre']; + $label = $module_data['nombre']; } $temp[$label]['g'] = round($temp_data, 4); From a21f2fc96db2c52cd85057c5d29be6202ea3baa5 Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Mon, 11 Mar 2019 13:43:37 +0100 Subject: [PATCH 2/3] Resolved Former-commit-id: 4d15a55f166cdc9b111379b0b2302ac74e836bdb --- pandora_console/include/functions_events.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index fa8287f406..93fb704a6c 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -3169,8 +3169,7 @@ function events_page_general($event) $table_general->data[] = $data; - $event['owner_user'] = $event['id_usuario']; - + // $event['owner_user'] = $event['id_usuario']; $data = []; $data[0] = __('Owner'); if (empty($event['owner_user'])) { From bf18d0374c3100f80855e9b9389c8bbece878af1 Mon Sep 17 00:00:00 2001 From: "marcos.alconada" Date: Mon, 11 Mar 2019 13:49:45 +0100 Subject: [PATCH 3/3] changed wrong php Former-commit-id: 311c78efd112c85494885f9a01ac6b3e6e15d163 --- pandora_console/include/functions_graph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index bf28373284..71049d7804 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1834,7 +1834,7 @@ function graphic_combined_module( $label = $params_combined['labels'][$module]; } else { $alias = db_get_value('alias', 'tagente', 'id_agente', $module_data['id_agente']); - $label = $module_data['nombre']; + $label = $alias.' - '.$module_data['nombre']; } $temp[$label]['g'] = round($temp_data, 4);