diff --git a/web/skins/classic/views/css/log.css b/web/skins/classic/views/css/log.css index 38d66665c..44f309b9b 100644 --- a/web/skins/classic/views/css/log.css +++ b/web/skins/classic/views/css/log.css @@ -42,3 +42,12 @@ tr.log-dbg td { margin-right: 4px; vertical-align: middle; } + +#exportError { + display: none; + color: #dc143c; + margin-bottom: 8px; +} + +#exportErrorText { +} diff --git a/web/skins/classic/views/js/log.js b/web/skins/classic/views/js/log.js index 4c9b38bcf..c46fa5151 100644 --- a/web/skins/classic/views/js/log.js +++ b/web/skins/classic/views/js/log.js @@ -191,13 +191,23 @@ function exportResponse( response ) } } +function exportFail( request ) +{ + $('exportLog').unspin(); + $('exportErrorText').set('text', request.status+" / "+request.statusText ); + $('exportError').show(); + Error( "Export request failed: "+request.status+" / "+request.statusText ); +} + function exportRequest() { var form = $('exportForm'); + $('exportErrorText').set('text', "" ); + $('exportError').hide(); if ( form.validate() ) { var exportParms = "view=request&request=log&task=export"; - var exportReq = new Request.JSON( { url: thisUrl, method: 'post', link: 'cancel', onSuccess: exportResponse } ); + 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' ) { diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php index 860fc0353..ba0e97a20 100644 --- a/web/skins/classic/views/log.php +++ b/web/skins/classic/views/log.php @@ -102,7 +102,8 @@ xhtmlHeaders(__FILE__, $SLANG['SystemLog'] ); -