}
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;
$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 });
}
}
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;
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 = (
$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}) });
}
my (@headers, @info_methods, @raw_methods, @methods);
for my $i (0 .. $#{ $self->info_headers->{headers} }) {
- next unless $self->info_headers->{used}->{ $self->info_headers->{headers}->[$i] };
+ next unless $self->info_headers->{used}->{ $self->info_headers->{methods}->[$i] };
push @headers, $self->info_headers->{headers}->[$i];
push @info_methods, $self->info_headers->{methods}->[$i];
}