From 37f7eb94294e05d29aa87b6068f7be04a49ea41b Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 18 Aug 2020 10:29:28 +0200 Subject: [PATCH 1/3] Changed action-alert setting --- pandora_server/lib/PandoraFMS/Core.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index e666ae9c91..560eac0b5e 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1018,9 +1018,9 @@ sub pandora_execute_action ($$$$$$$$$;$) { $field15 = defined($action->{'field15'}) && $action->{'field15'} ne "" ? $action->{'field15'} : $alert->{'field15'}; } else { - $field1 = defined($alert->{'field1'}) && $alert->{'field1'} ne "" ? $alert->{'field1'} : $action->{'field1'}; - $field2 = defined($alert->{'field2'}) && $alert->{'field2'} ne "" ? $alert->{'field2'} : $action->{'field2'}; - $field3 = defined($alert->{'field3'}) && $alert->{'field3'} ne "" ? $alert->{'field3'} : $action->{'field3'}; + $field1 = defined($action->{'field1'}) && $action->{'field1'} ne "" ? $action->{'field1'} : $alert->{'field1'}; + $field2 = defined($action->{'field2'}) && $action->{'field2'} ne "" ? $action->{'field2'} : $alert->{'field2'}; + $field3 = defined($action->{'field3'}) && $action->{'field3'} ne "" ? $action->{'field3'} : $alert->{'field3'}; $field4 = defined($action->{'field4'}) && $action->{'field4'} ne "" ? $action->{'field4'} : $alert->{'field4'}; $field5 = defined($action->{'field5'}) && $action->{'field5'} ne "" ? $action->{'field5'} : $alert->{'field5'}; $field6 = defined($action->{'field6'}) && $action->{'field6'} ne "" ? $action->{'field6'} : $alert->{'field6'}; From 1b14d83fd43afc8ca005e82749680ad33d0e069e Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 25 Aug 2020 10:58:26 +0200 Subject: [PATCH 2/3] Added None value --- pandora_console/godmode/alerts/alert_commands.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 5df94f29c3..5f696cec5e 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -291,8 +291,8 @@ if (is_ajax()) { 'field'.$i.'_value', '', '', - '', - 0, + __('None'), + '_field'.$i.'_', true, false, false, From 516de686cfc8978655b4033e8d2a1f760b4cea69 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 25 Aug 2020 15:03:19 +0200 Subject: [PATCH 3/3] Fixed issue --- pandora_console/godmode/alerts/alert_commands.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 5f696cec5e..88eedaaa27 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -292,7 +292,7 @@ if (is_ajax()) { '', '', __('None'), - '_field'.$i.'_', + '', true, false, false,