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

fixes to export functions

This commit is contained in:
Andrew Bauer 2020-12-02 12:02:24 -06:00
parent f13533cab7
commit aac47ed361
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/includes/export_functions.php
View File

@ -999,5 +999,5 @@ function exportEvents(
unlink($monitorPath.'/'.$html_eventMaster);
}
return '?view=archive%26type='.$exportFormat.'%26connkey='.$connkey;
return '?view=archive&type='.$exportFormat.'&connkey='.$connkey;
} // end function exportEvents

5
web/skins/classic/js/skin.js
View File

@ -830,10 +830,11 @@ function startDownload( exportFile ) {
}
function exportResponse(data, responseText) {
console.log(data);
console.log('exportResponse data: ' + JSON.stringify(data));
var generated = (data.result=='Ok') ? 1 : 0;
var exportFile = '?view=archive&type='+data.exportFormat+'&connkey='+data.connkey;
//var exportFile = '?view=archive&type='+data.exportFormat+'&connkey='+data.connkey;
var exportFile = data.exportFile;
$j('#exportProgress').removeClass( 'text-warning' );
if ( generated ) {