X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcsv_import%2F_deferred_results.html;h=f2061899a9423f68d2eec1f73f4f1d7f7166a8de;hb=d58b1a04c2facd0a4484cf2b801b27b9741cce26;hp=bc6d683794c17dcc9d171eda935e62fc42aeda7d;hpb=98f37c1019ea0e80d5a45a5633a0a182a43cbf9a;p=kivitendo-erp.git

diff --git a/templates/webpages/csv_import/_deferred_results.html b/templates/webpages/csv_import/_deferred_results.html
index bc6d68379..f2061899a 100644
--- a/templates/webpages/csv_import/_deferred_results.html
+++ b/templates/webpages/csv_import/_deferred_results.html
@@ -4,9 +4,11 @@
 
 <h2>[% 'Import Status' | $T8 %]</h2>
 
-[% PROCESS 'common/flash.html' %]
+[% INCLUDE 'common/flash.html' %]
+[% UNLESS SELF.background_job.data_as_hash.errors %]
 <div id='progress_description'></div>
 <div id='progressbar'></div>
+[% END  %]
 <script type='text/javascript'>
   function reload_results () {
     $.ajax({
@@ -20,11 +22,11 @@
       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 %]');
+    $('#progress_description').html('[% SELF.status_text | html %]');
     $('#progressbar').progressbar({ value: [% SELF.background_job.data_as_hash.progress.progress * 1 %] });
-    window.setTimeout(reload_results, 100);
+    window.setTimeout(reload_results, 500);
   })
 [%- END %]
 </script>