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

Fake import works, won't fire rules yet. also needs a state.

Browse Source
This commit is contained in:
James Cole
2018-05-03 18:17:59 +02:00
parent 6bddb63b45
commit 480d65fc1f
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/ff/import/status_v2.js vendored
View File

@@ -95,6 +95,9 @@ function showJobResults(data) {
// render the count:
$('#import-status-more-info').append($('<span>').text(data.journals_text));
if(data.tag_id) {
$('#import-status-more-info').append($('<br>')).append($('<span>').html(data.tag_text));
}
// render relevant data from JSON thing.
if (data.errors.length > 0) {
@@ -182,7 +185,7 @@ function showProgressBox(status) {
// hide initial status box:
$('.status_initial').hide();
if(status === 'running') {
if(status === 'running' || status === 'ready_to_run') {
$('#import-status-txt').text(langImportRunning);
} else {
$('#import-status-txt').text(langImportStoring);