Update jQuery auf 1.9.1, jQuery-UI auf 1.10.1

[kivitendo-erp.git] / SL / Controller / CsvImport.pm

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index bc0534f..dda0882 100644 (file)
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -38,6 +38,7 @@ __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('ensure_form_structure');
 __PACKAGE__->run_before('check_type', except => [ qw(report) ]);
 __PACKAGE__->run_before('load_all_profiles');
+__PACKAGE__->run_before('check_task_server');
 
 __PACKAGE__->run_after('cleanup_reports');
 
@@ -99,7 +100,7 @@ sub action_result {
   }
 
   if ($data->{progress}{finished} || $data->{errors}) {
-    $self->render('csv_import/_deferred_report', { no_layout => 1 });
+    $self->render('csv_import/_deferred_report', { layout => 0 });
   } else {
     if (!$self->task_server->is_running) {
       $self->task_server->start;
@@ -110,7 +111,7 @@ sub action_result {
       $self->{status_text} = t8('Import not started yet, please wait...');
     }
 
-    $self->render('csv_import/_deferred_results', { no_layout => 1 });
+    $self->render('csv_import/_deferred_results', { layout => 0 });
   }
 }
 
@@ -183,7 +184,7 @@ sub action_report {
   $self->{pages} = $pages;
   $self->{base_url} = $self->url_for(action => 'report', id => $report_id, no_layout => $params{no_layout} || $::form->{no_layout} );
 
-  $self->render('csv_import/report', { no_layout => $params{no_layout} || $::form->{no_layout} });
+  $self->render('csv_import/report', { layout => !($params{no_layout} || $::form->{no_layout}) });
 }
 
 
@@ -304,7 +305,7 @@ sub test_and_import {
 
   my $worker = $self->worker();
 
-  $worker->run;
+  $worker->run(%params);
 
   return if $self->errors;
 
@@ -497,4 +498,12 @@ sub cleanup_reports {
   SL::DB::Manager::CsvImportReport->cleanup;
 }
 
+sub check_task_server {
+  return 1 if $_[0]->task_server->is_running;
+
+  flash('info', t8('The task server is not running at the moment but needed for this module'));
+
+  1;
+}
+
 1;