projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
surplus: Erfassungsdatum bei Stammdatensuche Waren/Dienstleistungen/Erzeugnisse ...
[kivitendo-erp.git]
/
SL
/
Controller
/
CsvImport.pm
diff --git
a/SL/Controller/CsvImport.pm
b/SL/Controller/CsvImport.pm
index
3cd0da2
..
1992210
100644
(file)
--- 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::Controller::CsvImport::Shipto;
use SL::Controller::CsvImport::Project;
use SL::Controller::CsvImport::Order;
+use SL::JSON;
use SL::BackgroundJob::CsvImport;
use SL::System::TaskServer;
use SL::BackgroundJob::CsvImport;
use SL::System::TaskServer;
@@
-318,7
+319,11
@@
sub test_and_import_deferred {
$self->{deferred} = 1;
$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 {
}
sub test_and_import {