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-7902-Bug-visual-en-modal-de-edición-de-acciones-de-alertas' into 'develop' 

Ent 7902 bug visual en modal de edición de acciones de alertas

See merge request artica/pandorafms!4541
This commit is contained in:
Daniel Rodriguez 2021-11-24 17:20:35 +00:00
parent fff8f910f8 3bfce928c4
commit 5fcabbf959
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -688,7 +688,7 @@ foreach ($simple_alerts as $alert) {
$data[3] .= '</tr>'; $data[3] .= '</tr>';
} }
$data[3] .= '<div id="update_action-div" class="invisible">'; $data[3] .= '<div id="update_action-div-'.$alert['id'].'" class="invisible">';
$data[3] .= '</div>'; $data[3] .= '</div>';
$data[3] .= '</table>'; $data[3] .= '</table>';
// Is possible manage actions if have LW permissions in the agent group of the alert module // Is possible manage actions if have LW permissions in the agent group of the alert module
@ -706,9 +706,9 @@ foreach ($simple_alerts as $alert) {
$actions = alerts_get_alert_actions_filter(true, 'id_group IN ('.$filter_groups.')'); $actions = alerts_get_alert_actions_filter(true, 'id_group IN ('.$filter_groups.')');
} }
$data[3] .= '<div id="add_action-div-'.$alert['id'].'" class="invisible left">'; $data[3] .= '<div id="add_action-div-'.$alert['id'].'" class="invisible">';
$data[3] .= '<form id="add_action_form-'.$alert['id'].'" method="post">'; $data[3] .= '<form id="add_action_form-'.$alert['id'].'" method="post" style="height:85%;">';
$data[3] .= '<table class="databox_color w100p bg_color222">'; $data[3] .= '<table class="databox_color w100p bg_color222" style="height:100%;">';
$data[3] .= html_print_input_hidden('add_action', 1, true); $data[3] .= html_print_input_hidden('add_action', 1, true);
$data[3] .= html_print_input_hidden('id_alert_module', $alert['id'], true); $data[3] .= html_print_input_hidden('id_alert_module', $alert['id'], true);
@ -1127,13 +1127,14 @@ function show_add_action(id_alert) {
background: "black" background: "black"
}, },
open: function() { open: function() {
$(`#add_action-div-${id_alert}`).css('overflow', 'hidden');
$("#action_select, #action_select").select2({ $("#action_select, #action_select").select2({
tags: true, tags: true,
dropdownParent: $("#add_action-div-" + id_alert) dropdownParent: $("#add_action-div-" + id_alert)
}); });
}, },
width: 500, width: 455,
height: 300 height: 500
}) })
.show (); .show ();
} }
@ -1151,8 +1152,8 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m
type: 'POST', type: 'POST',
url: action="<?php echo ui_get_full_url('ajax.php', false, false, false); ?>", url: action="<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
success: function (data) { success: function (data) {
$("#update_action-div").html (data); $(`#update_action-div-${alert_id}`).html (data);
$("#update_action-div").hide () $(`#update_action-div-${alert_id}`).hide ()
.dialog ({ .dialog ({
resizable: true, resizable: true,
draggable: true, draggable: true,
@ -1163,14 +1164,14 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m
background: "black" background: "black"
}, },
open: function() { open: function() {
$('#update_action-div').css('overflow', 'hidden'); $(`#update_action-div-${alert_id}`).css('overflow', 'hidden');
$("#action_select, #action_select_ajax").select2({ $(`#action_select_ajax-${alert_id}`).select2({
tags: true, tags: true,
dropdownParent: $('#update_action-') dropdownParent: $(`#update_action-div-${alert_id}`)
}); });
}, },
width: 455, width: 455,
height: 370 height: 500
}) })
.show (); .show ();
} }

3
pandora_console/godmode/alerts/alert_list.php
View File

@ -270,7 +270,8 @@ if ($add_action) {
} }
if ($update_action) { if ($update_action) {
$id_action = (int) get_parameter('action_select_ajax'); $alert_id = (int) get_parameter('alert_id');
$id_action = (int) get_parameter('action_select_ajax-'.$alert_id);
$id_module_action = (int) get_parameter('id_module_action_ajax'); $id_module_action = (int) get_parameter('id_module_action_ajax');
$fires_min = (int) get_parameter('fires_min_ajax'); $fires_min = (int) get_parameter('fires_min_ajax');
$fires_max = (int) get_parameter('fires_max_ajax'); $fires_max = (int) get_parameter('fires_max_ajax');

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

@ -422,13 +422,18 @@ if ($show_update_action_menu) {
$id_action $id_action
); );
$data .= '<form id="update_action-'.$alert['id'].'" method="post" style="height:85%;">'; $data .= '<form id="update_action-'.$id_alert.'" method="post" style="height:85%;">';
$data .= '<table class="databox_color w100p bg_color222" style="height:100%;">'; $data .= '<table class="databox_color w100p bg_color222" style="height:100%;">';
$data .= html_print_input_hidden( $data .= html_print_input_hidden(
'update_action', 'update_action',
1, 1,
true true
); );
$data .= html_print_input_hidden(
'alert_id',
$id_alert,
true
);
$data .= html_print_input_hidden( $data .= html_print_input_hidden(
'id_module_action_ajax', 'id_module_action_ajax',
$id_action, $id_action,
@ -478,7 +483,7 @@ if ($show_update_action_menu) {
$data .= '<td class="datos2">'; $data .= '<td class="datos2">';
$data .= html_print_select( $data .= html_print_select(
$actions, $actions,
'action_select_ajax', 'action_select_ajax-'.$id_alert,
$action_option['id_alert_action'], $action_option['id_alert_action'],
'', '',
false, false,

7
pandora_console/include/styles/pandora.css
View File

@ -3279,13 +3279,6 @@ td.empty_field {
width: 96%; width: 96%;
} }
#update_action-
> .select2-container--default
.select2-results
> .select2-results__options {
max-height: 125px !important;
}
/* Policies styles */ /* Policies styles */
table#policy_modules td * { table#policy_modules td * {