tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-6093-error-fields-en-alertas-snmp' into 'develop'

Browse Source 
Changed action-alert setting

Closes pandora_enterprise#6093

See merge request
This commit is contained in:
Alejandro Fraguas 2020-08-26 10:02:58 +02:00
commit 01f9c87fb9
2 changed files with 4 additions and 4 deletions
pandora_console/godmode/alerts
alert_commands.php
pandora_server/lib/PandoraFMS
Core.pm

2
pandora_console/godmode/alerts/alert_commands.php

@ -291,8 +291,8 @@ if (is_ajax()) {
'field'.$i.'_value',
'',
'',
__('None'),
'',
0,
true,
false,
false,

6
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'};