X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FCsvImport.pm;h=19922109fc487b8e4fe76ac5460a841f84cf427a;hb=ad033a768bbe46566afa159008c42ff7fc6bb35a;hp=3cd0da24f741e9c54852cef3f3ce07c4e6ba9951;hpb=1adadc3007e658f3c0723701e79f42569e71df9f;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm index 3cd0da24f..19922109f 100644 --- a/SL/Controller/CsvImport.pm +++ b/SL/Controller/CsvImport.pm @@ -17,6 +17,7 @@ use SL::Controller::CsvImport::Inventory; use SL::Controller::CsvImport::Shipto; use SL::Controller::CsvImport::Project; use SL::Controller::CsvImport::Order; +use SL::JSON; use SL::BackgroundJob::CsvImport; use SL::System::TaskServer; @@ -318,7 +319,11 @@ sub test_and_import_deferred { $self->{deferred} = 1; - $self->render_inputs; + if ($::request->type eq 'json') { + $self->render(\ SL::JSON::to_json($self->{background_job}->as_tree), { type => 'json' }) + } else { + $self->render_inputs; + } } sub test_and_import {