From d425e25c035bddc2ecf681efcd41e40fd5c0ca65 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Wed, 10 Apr 2024 13:02:37 +0200 Subject: [PATCH 1/3] 13451-Fix text color autocomplete agents result --- pandora_console/include/functions_ui.php | 8 ++++---- pandora_console/include/styles/pandora_black.css | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 468dae0c4d..c42a69ae57 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -6470,25 +6470,25 @@ function ui_print_agent_autocomplete_input($parameters) switch (item.filter) { default: case \'agent\': - return $("
  • ") + return $("
  • ") .data("item.autocomplete", item) .append(text) .appendTo(ul); break; case \'address\': - return $("
  • ") + return $("
  • ") .data("item.autocomplete", item) .append(text) .appendTo(ul); break; case \'description\': - return $("
  • ") + return $("
  • ") .data("item.autocomplete", item) .append(text) .appendTo(ul); break; case \'alias\': - return $("
  • ") + return $("
  • ") .data("item.autocomplete", item) .append(text) .appendTo(ul); diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index 9cc4df9c45..f2daebfd29 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -1970,3 +1970,7 @@ input.button_task:not(div.login_pass > input):not(div.login_nick .empty-view > .empty-view-img-text > img { filter: brightness(0.85); } + +li.agent-autocomplete-li-text-color a { + color: #333 !important; +} From fdc5df1ba414ffc31690763ad64a531259a55328 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Thu, 11 Apr 2024 15:42:51 +0200 Subject: [PATCH 2/3] 13451-Fix widget Module value color --- .../lib/Dashboard/Widgets/module_value.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_value.php b/pandora_console/include/lib/Dashboard/Widgets/module_value.php index 87992ab3ba..a315e8d469 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/module_value.php +++ b/pandora_console/include/lib/Dashboard/Widgets/module_value.php @@ -459,12 +459,17 @@ class ModuleValueWidget extends Widget $last = modules_get_last_value($this->values['moduleId']); - if (($last >= $sql_data['min_warning']) && ($last < $sql_data['max_warning'])) { - $color = COL_WARNING; - } + if (empty($sql_data['min_warning']) === false || empty($sql_data['max_warning']) === false + || empty($sql_data['min_critical']) === false || empty($sql_data['max_critical']) === false + || empty($sql_data['str_warning']) === false + ) { + if (($last >= $sql_data['min_warning']) && ($last < $sql_data['max_warning'])) { + $color = COL_WARNING; + } - if ($last >= $sql_data['max_warning']) { - $color = COL_CRITICAL; + if ($last >= $sql_data['max_warning']) { + $color = COL_CRITICAL; + } } $uuid = uniqid(); From 7dafacf94f654568a1f7e8aed3786fd5c565bc68 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Thu, 11 Apr 2024 19:05:57 +0200 Subject: [PATCH 3/3] 13451-Revert - Fix widget Module value color --- .../lib/Dashboard/Widgets/module_value.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_value.php b/pandora_console/include/lib/Dashboard/Widgets/module_value.php index a315e8d469..87992ab3ba 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/module_value.php +++ b/pandora_console/include/lib/Dashboard/Widgets/module_value.php @@ -459,17 +459,12 @@ class ModuleValueWidget extends Widget $last = modules_get_last_value($this->values['moduleId']); - if (empty($sql_data['min_warning']) === false || empty($sql_data['max_warning']) === false - || empty($sql_data['min_critical']) === false || empty($sql_data['max_critical']) === false - || empty($sql_data['str_warning']) === false - ) { - if (($last >= $sql_data['min_warning']) && ($last < $sql_data['max_warning'])) { - $color = COL_WARNING; - } + if (($last >= $sql_data['min_warning']) && ($last < $sql_data['max_warning'])) { + $color = COL_WARNING; + } - if ($last >= $sql_data['max_warning']) { - $color = COL_CRITICAL; - } + if ($last >= $sql_data['max_warning']) { + $color = COL_CRITICAL; } $uuid = uniqid();