From 9a32c0c7000ca43f83d354dcf058c18082db6c63 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 12 Jul 2023 14:16:35 +0200 Subject: [PATCH 1/4] #11710 fix pagination alerts node on centraliced --- pandora_console/godmode/alerts/alert_commands.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 771a842cc3..f27a91bd1d 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -724,14 +724,6 @@ if ($copy_command) { $is_management_allowed = is_management_allowed(); if ($is_management_allowed === false) { - if (is_metaconsole() === false) { - $url = ''.__('metaconsole').''; - } else { - $url = __('any node'); - } - ui_print_warning_message( __( 'This node is configured with centralized mode. All alert commands information is read only. Go to %s to manage it.', From 6c4143db102d5cd7d7d51b736f1a5c45390f3605 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 4 Aug 2023 08:40:46 +0200 Subject: [PATCH 2/4] #11710 change message "go to metaconsole" --- pandora_console/godmode/alerts/alert_commands.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index f27a91bd1d..4e94ca587d 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -725,10 +725,7 @@ if ($copy_command) { $is_management_allowed = is_management_allowed(); if ($is_management_allowed === false) { ui_print_warning_message( - __( - 'This node is configured with centralized mode. All alert commands information is read only. Go to %s to manage it.', - $url - ) + __('This node is configured with centralized mode. All alert commands information is read only. Go to metaconsole to manage it.') ); } From 10dd156b1683e0b5ddbda5776b09acc3f7a1843a Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 4 Aug 2023 09:29:47 +0200 Subject: [PATCH 3/4] #11710 redirect meta message --- pandora_console/godmode/alerts/alert_commands.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index cdb111ed4c..5efd9f0e6a 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -724,8 +724,19 @@ if ($copy_command) { $is_management_allowed = is_management_allowed(); if ($is_management_allowed === false) { + if (is_metaconsole() === false) { + $url = ''.__('metaconsole').''; + } else { + $url = __('any node'); + } + ui_print_warning_message( - __('This node is configured with centralized mode. All alert commands information is read only. Go to metaconsole to manage it.') + __( + 'This node is configured with centralized mode. All alert commands information is read only. Go to %s to manage it.', + $url + ) ); } From 47155513ccfc9883fdcd5d5d8a267d6c6ab7f599 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 4 Aug 2023 10:17:59 +0200 Subject: [PATCH 4/4] #11710 fix error redirect url and pagination --- pandora_console/godmode/alerts/alert_commands.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 5efd9f0e6a..75a80d8d57 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -725,17 +725,17 @@ if ($copy_command) { $is_management_allowed = is_management_allowed(); if ($is_management_allowed === false) { if (is_metaconsole() === false) { - $url = ''.__('metaconsole').''; } else { - $url = __('any node'); + $url_redirect = __('any node'); } ui_print_warning_message( __( 'This node is configured with centralized mode. All alert commands information is read only. Go to %s to manage it.', - $url + $url_redirect ) ); }