tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11432-error-creacion-alertas-al-anadir-acciones-sobre-una-alerta' into 'develop' 

Ent 11432 error creacion alertas al anadir acciones sobre una alerta

See merge request artica/pandorafms!6009
This commit is contained in:
Rafael Ameijeiras 2023-06-01 16:26:18 +00:00
parent 762d82fad3 92842df7b8
commit 2122ae8e56
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/alerts/alert_list.builder.php
View File

@ -166,10 +166,10 @@ $table->data[1][1] = html_print_label_input_block(
);
$table->data[2][0] = html_print_label_input_block(
__('Threshold'),
__('Threshold').ui_print_help_tip(__('It takes precedence over the action\'s threshold configuration.'), true),
html_print_extended_select_for_time(
'module_action_threshold',
0,
'0',
'',
'',
'',

4
pandora_console/godmode/alerts/configure_alert_action.php
View File

@ -144,7 +144,7 @@ if ($disabled) {
$name = '';
$id_command = '';
$group = 0;
$action_threshold = 0;
$action_threshold = '0';
// All group is 0.
if ($id) {
$action = alerts_get_alert_action($id);
@ -284,7 +284,7 @@ $table->data[1][0] = html_print_label_input_block(
);
$table->data[1][1] = html_print_label_input_block(
__('Threshold'),
__('Threshold').ui_print_help_tip(__('An alert action is executed only once within this time interval, regardless of how many times the alert is triggered.'), true),
html_print_extended_select_for_time(
'action_threshold',
$action_threshold,

2
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -688,7 +688,7 @@ if ($step == 2) {
);
$table->data[2][0] = html_print_label_input_block(
__('Time threshold'),
__('Time threshold').ui_print_help_tip(__('Reset the alert counter within the configured period if there is no manual recovery or validation of the alert.'), true),
html_print_extended_select_for_time(
'threshold',
$threshold,

2
pandora_console/include/ajax/alert_list.ajax.php
View File

@ -537,7 +537,7 @@ if ($show_update_action_menu) {
$data .= '</tr>';
$data .= '<tr class="datos2">';
$data .= '<td class="datos2 bolder pdd_6px font_10pt">';
$data .= __('Threshold');
$data .= __('Threshold').ui_print_help_tip(__('If a value of 0 is assigned, the Threshold of the action will be used.'), true);
$data .= '</td>';
$data .= '<td class="datos2">';
$data .= html_print_extended_select_for_time(