IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-07 14:44:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2724 from danger89/clean_files_only

Browse Source 
Clean-up only
This commit is contained in:
James Cole 2019-10-12 03:53:27 +02:00 committed by GitHub
commit 9ed32ad227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/v1/js/ff/import/status_v2.js vendored
View File

@ -24,7 +24,7 @@ var timeOutId;
var jobRunRoutineStarted = false;
var jobStorageRoutineStarted = false;
var checkInitialInterval = 1000;
var checkNextInterval = 500;
var checkNextInterval = 800;
var maxLoops = 65536;
var totalLoops = 0;
var startCount = 0;
@ -59,7 +59,6 @@ function checkJobJSONStatus() {
*/
function reportJobJSONDone(data) {
console.log('In reportJobJSONDone() with status "' + data.status + '"');
console.log(data);
switch (data.status) {
case "ready_to_run":
if (startCount > 0) {
@ -87,10 +86,8 @@ function reportJobJSONDone(data) {
showJobResults(data);
break;
default:
console.warn('No specific action for status ' + data.status);
showProgressBox(data.status);
recheckJobJSONStatus();
}
}
@ -120,7 +117,6 @@ function showJobResults(data) {
// show success box.
$('.status_finished').show();
}
/**
@ -230,8 +226,6 @@ function showProgressBox(status) {
}
$('#import-status-txt').text('Job status: ' + status);
}
/**
@ -290,7 +284,5 @@ function reportJobPOSTDone(data) {
$('.fatal_error').show();
console.error(data.message);
$('.fatal_error_txt').text('Job could not be started or crashed: ' + data.message);
}
}

3
resources/views/v1/import/status.twig
View File

@ -172,7 +172,6 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript">
var jobStatusUri = '{{ route('import.job.status.json', [importJob.key]) }}';
var jobStartUri = '{{ route('import.job.start', [importJob.key]) }}';
var jobConfigurationUri = '{{ route('import.job.configuration.index', [importJob.key]) }}';
@ -188,8 +187,6 @@
{#var langImportSingleError = '{{ trans('import.status_errors_single')|escape('js') }}';#}
{#var langImportMultiError = '{{ trans('import.status_errors_multi')|escape('js') }}';#}
var token = '{{ csrf_token() }}';
var job = {{ job|json_encode|raw }};
</script>