X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/b6cdc1548bb601935b6c44300895bc996edc572a..7b38e23d6509d1e4520caf77c9698bdb077c215f:/SL/Controller/CsvImport.pm

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 89bf33c2b..47dd76563 100644
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -100,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;
@@ -111,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 });
   }
 }
 
@@ -152,7 +152,7 @@ sub action_report {
   my $page = $::form->{page} || 1;
   my $pages = {};
   $pages->{per_page}        = $::form->{per_page} || 20;
-  $pages->{max}             = SL::DB::Helper::Paginated::ceil($num_rows / ($num_cols || 1), $pages->{per_page}) || 1;
+  $pages->{max}             = SL::DB::Helper::Paginated::ceil($num_rows, $pages->{per_page}) || 1;
   $pages->{cur}             = $page < 1 ? 1
                             : $page > $pages->{max} ? $pages->{max}
                             : $page;
@@ -162,7 +162,7 @@ sub action_report {
     0,
     $pages->{per_page} * ($pages->{cur}-1) + 1
       ..
-    min($pages->{per_page} * $pages->{cur}, $num_rows / ($num_cols || 1) - 1)
+    min($pages->{per_page} * $pages->{cur}, $num_rows)
   ];
 
   my @query = (
@@ -184,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}) });
 }
 
 
@@ -305,7 +305,7 @@ sub test_and_import {
 
   my $worker = $self->worker();
 
-  $worker->run;
+  $worker->run(%params);
 
   return if $self->errors;