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

event filters group selectors

This commit is contained in:
fbsanchez 2019-06-18 11:00:48 +02:00
parent f7cf6e1e8b
commit dc81d168e0
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/ajax/events.php
View File

@ -420,6 +420,13 @@ if ($save_filter_modal) {
$data[1] = __('Filter group').$jump; $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( $data[1] .= html_print_select(
$user_groups_array, $user_groups_array,
'id_group_filter', 'id_group_filter',

2
pandora_console/include/functions_events.php
View File

@ -2901,7 +2901,7 @@ function events_get_event_filter_select($manage=true)
$sql = ' $sql = '
SELECT id_filter, id_name SELECT id_filter, id_name
FROM tevent_filter 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); $event_filters = db_get_all_rows_sql($sql);

19
pandora_console/include/javascript/pandora_events.js
View File

@ -680,6 +680,8 @@ function update_event(table, id_evento, type, row) {
// Update events matching current filters and id_evento selected. // Update events matching current filters and id_evento selected.
$.ajax({ $.ajax({
async: true,
timeout: 10000,
type: "POST", type: "POST",
url: $("#hidden-ajax_file").val(), url: $("#hidden-ajax_file").val(),
data: { data: {
@ -799,31 +801,20 @@ function execute_event_response(event_list_btn) {
} }
} else { } else {
// It is not a custom response // It is not a custom response
var delay = 5000;
var $i = 0;
switch (response_id) { switch (response_id) {
case "in_progress_selected": case "in_progress_selected":
$(".chk_val:checked").each(function() { $(".chk_val:checked").each(function() {
setTimeout( in_process_event(dt_events, $(this).val(), this.parentElement);
in_process_event(dt_events, $(this).val(), this.parentElement),
total_checked * delay * $i++
);
}); });
break; break;
case "validate_selected": case "validate_selected":
$(".chk_val:checked").each(function() { $(".chk_val:checked").each(function() {
setTimeout( validate_event(dt_events, $(this).val(), this.parentElement);
validate_event(dt_events, $(this).val(), this.parentElement),
total_checked * delay * $i++
);
}); });
break; break;
case "delete_selected": case "delete_selected":
$(".chk_val:checked").each(function() { $(".chk_val:checked").each(function() {
setTimeout( delete_event(dt_events, $(this).val(), this.parentElement);
delete_event(dt_events, $(this).val(), this.parentElement),
total_checked * delay * $i++
);
}); });
break; break;
} }