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-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop' 

Ent 6490 errores en edicion de acciones de alertas

See merge request artica/pandorafms!3657
This commit is contained in:
Daniel Rodriguez 2021-01-04 11:11:16 +01:00
parent 5658b52e3f 1cf3381797
commit b9a2998c49
2 changed files with 10 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.php
View File

@ -284,9 +284,9 @@ if ($update_action) {
} }
$values['module_action_threshold'] = (int) get_parameter('module_action_threshold_ajax'); $values['module_action_threshold'] = (int) get_parameter('module_action_threshold_ajax');
$values['id_alert_action'] = $id_module_action; $values['id_alert_action'] = $id_action;
$result = alerts_update_alert_agent_module_action($id_action, $values); $result = alerts_update_alert_agent_module_action($id_module_action, $values);
if ($result) { if ($result) {
db_pandora_audit('Alert management', 'Update action '.$id_action.' in alert '.$id_alert_module); db_pandora_audit('Alert management', 'Update action '.$id_action.' in alert '.$id_alert_module);
} else { } else {

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

@ -411,7 +411,11 @@ if ($show_update_action_menu) {
$id_action = (int) get_parameter('id_action'); $id_action = (int) get_parameter('id_action');
$actions = alerts_get_alert_agent_module_actions($id_alert); $own_groups = users_get_groups($config['id_user'], 'LW', true);
$filter_groups = '';
$filter_groups = implode(',', array_keys($own_groups));
$actions = alerts_get_alert_actions_filter(true, 'id_group IN ('.$filter_groups.')');
$action_option = db_get_row( $action_option = db_get_row(
'talert_template_module_actions', 'talert_template_module_actions',
'id', 'id',
@ -427,7 +431,7 @@ if ($show_update_action_menu) {
); );
$data .= html_print_input_hidden( $data .= html_print_input_hidden(
'id_module_action_ajax', 'id_module_action_ajax',
$id_module_action, $id_action,
true true
); );
if (! $id_agente) { if (! $id_agente) {
@ -475,9 +479,9 @@ if ($show_update_action_menu) {
$data .= html_print_select( $data .= html_print_select(
$actions, $actions,
'action_select_ajax', 'action_select_ajax',
$id_action, $action_option['id_alert_action'],
'', '',
__('None'), false,
0, 0,
true, true,
false, false,