arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better error-handling for import.url() and import.dropbox()

Browse Source
This commit is contained in:
Tobias Reich 2015-06-28 23:13:48 +02:00
parent 035ca23c97
commit 61431c6e59
1 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/scripts/upload.js
View File

@ -303,7 +303,30 @@ upload.start = {
api.post('Import::url', params, function(data) { api.post('Import::url', params, function(data) {
basicModal.close(); // Same code as in import.dropbox()
if (data!==true) {
$('.basicModal .rows .row p.notice')
.html('The import has been finished, but returned warnings or errors. Please take a look at the log (Settings -> Show Log) for further details.')
.show();
$('.basicModal .rows .row .status')
.html('Finished')
.addClass('warning');
// Show close button
$('.basicModal #basicModal__action.hidden').show();
// Log error
lychee.error(null, params, data);
} else {
basicModal.close();
}
upload.notify('Import complete'); upload.notify('Import complete');
albums.refresh(); albums.refresh();
@ -311,8 +334,6 @@ upload.start = {
if (album.getID()===false) lychee.goto('0'); if (album.getID()===false) lychee.goto('0');
else album.load(albumID); else album.load(albumID);
if (data!==true) lychee.error(null, params, data);
}); });
}); });
@ -441,7 +462,30 @@ upload.start = {
api.post('Import::url', params, function(data) { api.post('Import::url', params, function(data) {
basicModal.close(); // Same code as in import.url()
if (data!==true) {
$('.basicModal .rows .row p.notice')
.html('The import has been finished, but returned warnings or errors. Please take a look at the log (Settings -> Show Log) for further details.')
.show();
$('.basicModal .rows .row .status')
.html('Finished')
.addClass('warning');
// Show close button
$('.basicModal #basicModal__action.hidden').show();
// Log error
lychee.error(null, params, data);
} else {
basicModal.close();
}
upload.notify('Import complete'); upload.notify('Import complete');
albums.refresh(); albums.refresh();
@ -449,8 +493,6 @@ upload.start = {
if (album.getID()===false) lychee.goto('0'); if (album.getID()===false) lychee.goto('0');
else album.load(albumID); else album.load(albumID);
if (data!==true) lychee.error(null, params, data);
}); });
}); });