Fehler korrekt weiterleiten

diff --git a/SL/BackgroundJob/CsvImport.pm b/SL/BackgroundJob/CsvImport.pm
index 0300179640f4750c0fc31935f610240d7bfc72e0..98aed9c37172b86d9e45b778a1f02434e6dc03e0 100644 (file)
--- a/SL/BackgroundJob/CsvImport.pm
+++ b/SL/BackgroundJob/CsvImport.pm
@@ -89,7 +89,6 @@ sub do_import {
   if ($c->errors) {
     $job->set_data(
       errors   => $c->errors,
   if ($c->errors) {
     $job->set_data(
       errors   => $c->errors,

-      progress => -1,

     )->save;
   } else {
 
     )->save;
   } else {
 

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 9704566d68d4f4408375e3ccc75b2fdc685ae556..681ebdd4714f00f90ba896d482107d07509ca0fc 100644 (file)
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -93,10 +93,10 @@ sub action_result {
     flash('error', $::locale->text('There was an error parsing the csv file: #1 in line #2.', $first_error->[2], $first_error->[0]));
   }
 
     flash('error', $::locale->text('There was an error parsing the csv file: #1 in line #2.', $first_error->[2], $first_error->[0]));
   }
 

-  if (!$data->{progress}{finished}) {
-    $self->render('csv_import/_deferred_results', { no_layout => 1 });
-  } else {
+  if ($data->{progress}{finished} || $data->{errors}) {

     $self->action_report(report_id => $data->{report_id}, no_layout => 1);
     $self->action_report(report_id => $data->{report_id}, no_layout => 1);

+  } else {
+    $self->render('csv_import/_deferred_results', { no_layout => 1 });

   }
 }
 
   }
 }
 

diff --git a/templates/webpages/csv_import/_deferred_results.html b/templates/webpages/csv_import/_deferred_results.html
index bc6d683794c17dcc9d171eda935e62fc42aeda7d..050ca5ade12ca14cdb3a5952cae7b896609f66b0 100644 (file)
--- a/templates/webpages/csv_import/_deferred_results.html
+++ b/templates/webpages/csv_import/_deferred_results.html
@@ -5,8 +5,10 @@
 <h2>[% 'Import Status' | $T8 %]</h2>
 
 [% PROCESS 'common/flash.html' %]
 <h2>[% 'Import Status' | $T8 %]</h2>
 
 [% PROCESS 'common/flash.html' %]

+[% UNLESS SELF.background_job.data_as_hash.errors %]

 <div id='progress_description'></div>
 <div id='progressbar'></div>
 <div id='progress_description'></div>
 <div id='progressbar'></div>

+[% END  %]

 <script type='text/javascript'>
   function reload_results () {
     $.ajax({
 <script type='text/javascript'>
   function reload_results () {
     $.ajax({


@@ -20,7 +22,7 @@
       error: function(e) { alert(e) },
     });
   }
       error: function(e) { alert(e) },
     });
   }

-[%- UNLESS SELF.background_job.data_as_hash.progress < 0 %]
+[%- UNLESS SELF.background_job.data_as_hash.errors %]

   $(document).ready(function(){
     $('#progress_description').html('[% SELF.background_job.data_as_hash.progress.plan.${SELF.background_job.data_as_hash.progress.phase} %] / [% SELF.background_job.data_as_hash.progress.num_phases %] [% SELF.background_job.data_as_hash.progress.phase | $T8 | html %]');
     $('#progressbar').progressbar({ value: [% SELF.background_job.data_as_hash.progress.progress * 1 %] });
   $(document).ready(function(){
     $('#progress_description').html('[% SELF.background_job.data_as_hash.progress.plan.${SELF.background_job.data_as_hash.progress.phase} %] / [% SELF.background_job.data_as_hash.progress.num_phases %] [% SELF.background_job.data_as_hash.progress.phase | $T8 | html %]');
     $('#progressbar').progressbar({ value: [% SELF.background_job.data_as_hash.progress.progress * 1 %] });