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

Fixed problems with filter, this lost when change the page in data view in 'Tree View'

This commit is contained in:
m-lopez-f 2015-02-06 11:09:41 +01:00
parent af236b3a4f
commit 76a1e25726
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pandora_console/operation/tree.php
View File

@ -885,18 +885,21 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
} }
// Show the modal window of an module // Show the modal window of an module
function show_module_detail_dialog(module_id, id_agent, server_name, offset, period) { function show_module_detail_dialog(module_id, id_agent, server_name, offset, period, selection_mode) {
var extra_parameters = ''; var extra_parameters = '';
if (period == -1) { var f = new Date();
period = $('#period').val(); period = $('#period').val();
var selection_mode = $('input[name=selection_mode]:checked').val(); var selection_mode = $('input[name=selection_mode]:checked').val();
var date_from = $('#text-date_from').val(); if(!selection_mode){selection_mode='fromnow';}
var time_from = $('#text-time_from').val(); var date_from = $('#text-date_from').val();
var date_to = $('#text-date_to').val(); if(!date_from){date_from =f.getFullYear() + "/" + (f.getMonth() +1) + "/" + f.getDate();}
var time_to = $('#text-time_to').val(); var time_from = $('#text-time_from').val();
if(!time_from){time_from = f.getHours() + ":" + f.getMinutes();}
extra_parameters = '&selection_mode=' + selection_mode + '&date_from=' + date_from + '&date_to=' + date_to + '&time_from=' + time_from + '&time_to=' + time_to; var date_to = $('#text-date_to').val();
} if(!date_to){date_to =f.getFullYear() + "/" + (f.getMonth() +1) + "/" + f.getDate();}
var time_to = $('#text-time_to').val();
if(!time_to){time_to = f.getHours() + ":" + f.getMinutes();}
extra_parameters = '&selection_mode=' + selection_mode + '&date_from=' + date_from + '&date_to=' + date_to + '&time_from=' + time_from + '&time_to=' + time_to;
$.ajax({ $.ajax({
type: "POST", type: "POST",
@ -919,7 +922,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
height: 500 height: 500
}) })
.show (); .show ();
refresh_pagination_callback (module_id, id_agent, server_name); refresh_pagination_callback (module_id, id_agent, server_name, period, selection_mode);
datetime_picker_callback(); datetime_picker_callback();
forced_title_callback(); forced_title_callback();
} }
@ -944,7 +947,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
} }
datetime_picker_callback(); datetime_picker_callback();
function refresh_pagination_callback (module_id, id_agent, server_name) { function refresh_pagination_callback (module_id, id_agent, server_name, period, selection_mode) {
$(".binary_dialog").click( function() { $(".binary_dialog").click( function() {
@ -956,7 +959,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
var period = $('#period').val(); var period = $('#period').val();
show_module_detail_dialog(module_id, id_agent, server_name, offset, period); show_module_detail_dialog(module_id, id_agent, server_name, offset, period, selection_mode);
return false; return false;
}); });
} }