From 7791639b3545145dd9cd2a137dc93d76dd73cb67 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Tue, 26 Feb 2019 13:31:35 +0100 Subject: [PATCH] fix bad image routes Former-commit-id: 236701131f5c2f5b11c01b878d8a04b71f76ddd3 --- .../include/class/TreeService.class.php | 24 +++++++++---------- .../include/javascript/tree/TreeController.js | 14 ++++++----- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pandora_console/include/class/TreeService.class.php b/pandora_console/include/class/TreeService.class.php index d211cd1055..b55643219d 100644 --- a/pandora_console/include/class/TreeService.class.php +++ b/pandora_console/include/class/TreeService.class.php @@ -91,20 +91,20 @@ class TreeService extends Tree { switch ($status) { case SERVICE_STATUS_NORMAL: - $processed_items[$row['id']]['statusImageHTML']='NORMAL status.'; + $processed_items[$row['id']]['statusImageHTML']='NORMAL status.'; break; case SERVICE_STATUS_CRITICAL: - $processed_items[$row['id']]['statusImageHTML']='CRITICAL status.'; + $processed_items[$row['id']]['statusImageHTML']='CRITICAL status.'; break; case SERVICE_STATUS_WARNING: - $processed_items[$row['id']][$key]['statusImageHTML']='WARNING status.'; + $processed_items[$row['id']][$key]['statusImageHTML']='WARNING status.'; break; case SERVICE_STATUS_UNKNOWN: default: - $processed_items[$row['id']]['statusImageHTML']='UNKNOWN status.'; + $processed_items[$row['id']]['statusImageHTML']='UNKNOWN status.'; break; } } @@ -201,16 +201,16 @@ class TreeService extends Tree { foreach ($data_modules as $key => $module) { switch ($module['estado']) { case '0': - $data_modules[$key]['statusImageHTML'] = 'NORMAL status.'; + $data_modules[$key]['statusImageHTML'] = 'NORMAL status.'; break; case '1': - $data_modules[$key]['statusImageHTML'] = 'CRITICAL status.'; + $data_modules[$key]['statusImageHTML'] = 'CRITICAL status.'; break; case '2': - $data_modules[$key]['statusImageHTML'] = 'WARNING status.'; + $data_modules[$key]['statusImageHTML'] = 'WARNING status.'; break; case '4': - $data_modules[$key]['statusImageHTML'] = 'UNKNOWN status.'; + $data_modules[$key]['statusImageHTML'] = 'UNKNOWN status.'; break; default: # code... @@ -267,20 +267,20 @@ class TreeService extends Tree { switch ($status) { case SERVICE_STATUS_NORMAL: - $service_stats[$row['id']]['statusImageHTML']='NORMAL status.'; + $service_stats[$row['id']]['statusImageHTML']='NORMAL status.'; break; case SERVICE_STATUS_CRITICAL: - $service_stats[$row['id']]['statusImageHTML']='CRITICAL status.'; + $service_stats[$row['id']]['statusImageHTML']='CRITICAL status.'; break; case SERVICE_STATUS_WARNING: - $service_stats[$row['id']][$key]['statusImageHTML']='WARNING status.'; + $service_stats[$row['id']][$key]['statusImageHTML']='WARNING status.'; break; case SERVICE_STATUS_UNKNOWN: default: - $service_stats[$row['id']]['statusImageHTML']='UNKNOWN status.'; + $service_stats[$row['id']]['statusImageHTML']='UNKNOWN status.'; break; } } diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js index 3e177f3ae9..04e67e670b 100644 --- a/pandora_console/include/javascript/tree/TreeController.js +++ b/pandora_console/include/javascript/tree/TreeController.js @@ -931,12 +931,14 @@ var TreeController = { } controller.recipient.empty(); - controller.recipient.html( - "
" + - controller.foundMessage + ": " + controller.tree.length + - "
" + - "
" - ); + if (controller.tree.length !== undefined) { + controller.recipient.html( + "
" + + controller.foundMessage + ": " + controller.tree.length + + "
" + + "
" + ); + } var $children = _processGroup(this.recipient, this.tree, true); $children.show();