ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Clear Log by using minTime and maxTime as timestamps. Fix export including unselected filters. Can't just serialize the form asit may contain fields in teh querystring so you get an array of values instead of a single value

This commit is contained in:
Isaac Connor 2020-12-01 14:24:41 -05:00
parent baeb1dbd5b
commit 48775e2230
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
web/skins/classic/views/js/log.js
View File

@ -1,5 +1,12 @@
var logParms = 'view=request&request=log&task=query';
var logReq = new Request.JSON( {url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: logResponse} );
var logReq = new Request.JSON( {
url: thisUrl,
method: 'post',
timeout: AJAX_TIMEOUT,
link: 'cancel',
onSuccess: logResponse
} );
var logTimer = undefined;
var logTable = undefined;
@ -171,18 +178,24 @@ function clearError() {
function clearLog() {
logReq.cancel();
var clearReq = new Request.JSON({
url: thisUrl,
method: 'post',
timeout: AJAX_TIMEOUT,
link: 'cancel',
onSuccess: clearResponse
});
var clearParms = 'view=request&request=log&task=delete';
var clearReq = new Request.JSON({url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: clearResponse});
var tbody = $(logTable).getElement('tbody');
var rows = tbody.getElements('tr');
if ( rows && rows.length ) {
var minTime = rows[0].getElement('td').get('text');
clearParms += "&minTime="+encodeURIComponent(minTime);
var maxTime = rows[rows.length-1].getElement('td').get('text');
clearParms += "&maxTime="+encodeURIComponent(maxTime);
}
var form = $('logForm');
clearReq.send(clearParms+"&"+form.toQueryString());
clearParms += "&minTime="+minLogTime;
clearParms += "&maxTime="+maxLogTime;
var filters =['Component', 'ServerId', 'Pid', 'Level', 'File', 'Line'];
filters.forEach(function(filter) {
var f = $j('#filter\\['+filter+'\\]');
if ( f.val() ) {
clearParms += '&'+encodeURIComponent('filter[' + filter + ']')+'='+encodeURIComponent(f.val());
}
});
clearReq.send(clearParms);
}
function filterLog() {
@ -236,13 +249,21 @@ function exportRequest() {
$('exportErrorText').set('text', '');
$('exportError').hide();
if ( form.validate() ) {
var exportReq = new Request.JSON({
url: thisUrl,
method: 'post',
link: 'cancel',
onSuccess: exportResponse,
onFailure: exportFail
});
var exportParms = "view=request&request=log&task=export";
var exportReq = new Request.JSON({url: thisUrl, method: 'post', link: 'cancel', onSuccess: exportResponse, onFailure: exportFail});
var selection = form.getElement('input[name=selector]:checked').get('value');
if ( selection == 'filter' || selection == 'current' ) {
$$('#filters select').each(
function( select ) {
exportParms += "&"+select.get('id')+"="+select.get('value');
if ( select.get('value') ) {
exportParms += "&"+select.get('id')+"="+select.get('value');
}
}
);
}
@ -250,6 +271,7 @@ function exportRequest() {
var tbody = $(logTable).getElement( 'tbody' );
var rows = tbody.getElements( 'tr' );
if ( rows ) {
// Need to convert this to TimeKey
var minTime = rows[0].getElement('td').get('text');
exportParms += "&minTime="+encodeURIComponent(minTime);
var maxTime = rows[rows.length-1].getElement('td').get('text');