diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 6d99e8b22e..1c9a4a6c7b 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -420,6 +420,13 @@ if ($save_filter_modal) { $data[1] = __('Filter group').$jump; } + $user_groups_array = users_get_groups_for_select( + $config['id_user'], + 'EW', + users_can_manage_group_all(), + true + ); + $data[1] .= html_print_select( $user_groups_array, 'id_group_filter', diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 368e02c028..acc36a8f09 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2901,7 +2901,7 @@ function events_get_event_filter_select($manage=true) $sql = ' SELECT id_filter, id_name FROM tevent_filter - WHERE id_group_filter IN ('.implode(',', array_keys($user_groups)).')'; + WHERE id_group_filter IN (0, '.implode(',', array_keys($user_groups)).')'; $event_filters = db_get_all_rows_sql($sql); diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index dee5498015..ff596aacb7 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -680,6 +680,8 @@ function update_event(table, id_evento, type, row) { // Update events matching current filters and id_evento selected. $.ajax({ + async: true, + timeout: 10000, type: "POST", url: $("#hidden-ajax_file").val(), data: { @@ -799,31 +801,20 @@ function execute_event_response(event_list_btn) { } } else { // It is not a custom response - var delay = 5000; - var $i = 0; switch (response_id) { case "in_progress_selected": $(".chk_val:checked").each(function() { - setTimeout( - in_process_event(dt_events, $(this).val(), this.parentElement), - total_checked * delay * $i++ - ); + in_process_event(dt_events, $(this).val(), this.parentElement); }); break; case "validate_selected": $(".chk_val:checked").each(function() { - setTimeout( - validate_event(dt_events, $(this).val(), this.parentElement), - total_checked * delay * $i++ - ); + validate_event(dt_events, $(this).val(), this.parentElement); }); break; case "delete_selected": $(".chk_val:checked").each(function() { - setTimeout( - delete_event(dt_events, $(this).val(), this.parentElement), - total_checked * delay * $i++ - ); + delete_event(dt_events, $(this).val(), this.parentElement); }); break; }