From 7b9d6fdca26920e339cc4d289a040ed213d00364 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Thu, 6 Apr 2023 09:52:46 +0200 Subject: [PATCH 1/5] 10871-Filter fixed in realtime snmp graph --- pandora_console/extensions/realtime_graphs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php index d0b5ef5e95..b14ce6c8b8 100644 --- a/pandora_console/extensions/realtime_graphs.php +++ b/pandora_console/extensions/realtime_graphs.php @@ -224,7 +224,7 @@ function pandora_realtime_graphs() false, '', 'white-box-content', - 'box-flat white_table_graph fixed_filter_bar' + 'box-flat white_table_graph' ); $chart[time()]['graph'] = '0'; From 8dfb01c7dab3e83fda6df3576ec7c634957e5ff6 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Mon, 10 Apr 2023 10:26:15 +0200 Subject: [PATCH 2/5] 10854-Break word SNMP Console trap --- pandora_console/include/class/SnmpConsole.class.php | 2 +- pandora_console/include/styles/pandora.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php index 3f48eb2c22..5ff370d69c 100644 --- a/pandora_console/include/class/SnmpConsole.class.php +++ b/pandora_console/include/class/SnmpConsole.class.php @@ -1443,7 +1443,7 @@ class SnmpConsole extends HTML binding_vars.forEach(function(oid) { string += oid+'
'; }); - variableBindings = `${string}`; + variableBindings = `${string}`; } tr.after(`${labelBindings}${variableBindings}`); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 96d2d09780..619ce85c7d 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -11895,3 +11895,7 @@ td[id^="table_info_box"] a { .info_table.events > tbody > tr > td { border-bottom: 1px solid #dedede !important; } + +.break-word { + word-wrap: break-word; +} From 7302a108c0ac12d52ec96c12fd669f889681b643 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 10 Apr 2023 12:02:35 +0200 Subject: [PATCH 3/5] fixed styles --- pandora_console/operation/agentes/ver_agente.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index ad7977c9f4..7fab4eab2b 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -1475,9 +1475,8 @@ if ($policyTab === ENTERPRISE_NOT_HOOK) { $policyTab = ''; } - // Omnishell. -$tasks = count_tasks_agent($id_agente); +$tasks = enterprise_hook('count_tasks_agent', [$id_agente]); if ($tasks === true) { $omnishellTab = enterprise_hook('omnishell_tab'); From 8c1fa4b245cacd7c3302a462bb0aa73d0aa75500 Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Mon, 10 Apr 2023 14:16:15 +0200 Subject: [PATCH 4/5] 10835-Logs icons --- pandora_console/include/class/AuditLog.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/AuditLog.class.php b/pandora_console/include/class/AuditLog.class.php index 93f391ee73..c16628dd69 100644 --- a/pandora_console/include/class/AuditLog.class.php +++ b/pandora_console/include/class/AuditLog.class.php @@ -134,7 +134,7 @@ class AuditLog extends HTML ui_print_standard_header( __('%s audit', get_product_name()).' » '.__('Review Logs'), - 'images/gm_log.png', + 'images/gm_log@svg.svg', false, '', false, From c0172afc3da39c4c7644f333153208aaea2e63b8 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 10 Apr 2023 16:38:37 +0200 Subject: [PATCH 5/5] update composer --- .../lib/ClusterViewer/ClusterWizard.php | 20 +++++----- pandora_console/views/cluster/edit.php | 39 ++++--------------- 2 files changed, 17 insertions(+), 42 deletions(-) diff --git a/pandora_console/include/lib/ClusterViewer/ClusterWizard.php b/pandora_console/include/lib/ClusterViewer/ClusterWizard.php index 4cc04e2318..d44ece7256 100644 --- a/pandora_console/include/lib/ClusterViewer/ClusterWizard.php +++ b/pandora_console/include/lib/ClusterViewer/ClusterWizard.php @@ -764,6 +764,7 @@ class ClusterWizard extends \HTML 'action' => $target_url, 'method' => 'POST', 'extra' => 'autocomplete="false"', + 'id' => 'cluster-edit-'.($this->page + 1), ]; if ($load_success === false && $this->page !== 0) { @@ -1245,17 +1246,16 @@ class ClusterWizard extends \HTML } // Submit button. - $form['inputs'][] = [ - 'arguments' => [ - 'name' => 'next', - 'label' => $str, - 'type' => 'submit', - 'attributes' => [ - 'icon' => 'wand', - 'mode' => 'primary', - ], - 'return' => true, + $form['submit-external-input'] = [ + 'name' => 'next', + 'label' => $str, + 'type' => 'submit', + 'attributes' => [ + 'icon' => 'wand', + 'mode' => 'primary', + 'form' => 'cluster-edit-'.($this->page + 1), ], + 'return' => true, ]; return $form; diff --git a/pandora_console/views/cluster/edit.php b/pandora_console/views/cluster/edit.php index b3c062977e..4c93fbd253 100644 --- a/pandora_console/views/cluster/edit.php +++ b/pandora_console/views/cluster/edit.php @@ -120,42 +120,17 @@ if (empty($wizard->errMessages) === false) { } } +$buttons_input = ''; if (empty($form) === false) { // Print form (prepared in ClusterWizard). + $submit = $form['submit-external-input']; + unset($form['submit-external-input']); + HTML::printForm($form, false, ($wizard->page < 6)); + $buttons_input .= HTML::printInput($submit); } // Print always go back button. -HTML::printForm($wizard->getGoBackForm(), false); +$buttons_input .= HTML::printForm($wizard->getGoBackForm(), true); -html_print_action_buttons( - '', - [] -); - -?> - - \ No newline at end of file +html_print_action_buttons($buttons_input);