Merge branch 'ent-8210-Bug-al-editar-acciones-ya-configuradas-en-alertas' into 'develop'

Ent 8210 bug al editar acciones ya configuradas en alertas

See merge request artica/pandorafms!4536
This commit is contained in:
Daniel Rodriguez 2021-11-22 12:44:51 +00:00
commit 13835582d2
3 changed files with 15 additions and 8 deletions

View File

@ -688,7 +688,7 @@ foreach ($simple_alerts as $alert) {
$data[3] .= '</tr>';
}
$data[3] .= '<div id="update_action-div" class="invisible left">';
$data[3] .= '<div id="update_action-div" class="invisible">';
$data[3] .= '</div>';
$data[3] .= '</table>';
// Is possible manage actions if have LW permissions in the agent group of the alert module
@ -1163,18 +1163,18 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m
background: "black"
},
open: function() {
$("#action_select_ajax, #action_select_ajax").select2({
$('#update_action-div').css('overflow', 'hidden');
$("#action_select, #action_select_ajax").select2({
tags: true,
dropdownParent: $("#update_action-div")
dropdownParent: $('#update_action-')
});
},
width: 500,
height: 300
width: 455,
height: 370
})
.show ();
}
});
}
/* ]]> */

View File

@ -422,8 +422,8 @@ if ($show_update_action_menu) {
$id_action
);
$data .= '<form id="update_action-'.$alert['id'].'" method="post">';
$data .= '<table class="databox_color w100p bg_color222">';
$data .= '<form id="update_action-'.$alert['id'].'" method="post" style="height:85%;">';
$data .= '<table class="databox_color w100p bg_color222" style="height:100%;">';
$data .= html_print_input_hidden(
'update_action',
1,

View File

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