kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix error display #662

Browse Source
This commit is contained in:
James Cole
2017-06-06 19:29:10 +02:00
parent 0e929602a8
commit 65ccb2d443
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/js/ff/export/index.js
View File

@@ -104,10 +104,22 @@ function callExport() {
// show download // show download
showDownload(); showDownload();
}).fail(function () { }).fail(function (data) {
// show error. // show error.
// show form again. // show form again.
showError('The export failed. Please check the log files to find out why.');
var errorText = 'The export failed. Please check the log files to find out why.';
if (typeof data.responseJSON === 'object') {
errorText = '';
for (var propt in data.responseJSON) {
if (data.responseJSON.hasOwnProperty(propt)) {
errorText += propt + ': ' + data.responseJSON[propt][0];
}
}
}
showError(errorText);
// stop polling: // stop polling:
window.clearTimeout(intervalId); window.clearTimeout(intervalId);