projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Zirkuläres Includieren von SL::Form vermeiden
[kivitendo-erp.git]
/
SL
/
Controller
/
Helper
/
ReportGenerator.pm
diff --git
a/SL/Controller/Helper/ReportGenerator.pm
b/SL/Controller/Helper/ReportGenerator.pm
index
0cf376d
..
e84f9ca
100644
(file)
--- a/
SL/Controller/Helper/ReportGenerator.pm
+++ b/
SL/Controller/Helper/ReportGenerator.pm
@@
-5,7
+5,6
@@
use strict;
use Carp;
use List::Util qw(max);
use Carp;
use List::Util qw(max);
-use SL::Form;
use SL::Common;
use SL::MoreCommon;
use SL::ReportGenerator;
use SL::Common;
use SL::MoreCommon;
use SL::ReportGenerator;
@@
-19,6
+18,9
@@
our @EXPORT = qw(
sub action_report_generator_export_as_pdf {
my ($self) = @_;
sub action_report_generator_export_as_pdf {
my ($self) = @_;
+
+ delete $::form->{action_report_generator_export_as_pdf};
+
if ($::form->{report_generator_pdf_options_set}) {
my $saved_form = save_form();
if ($::form->{report_generator_pdf_options_set}) {
my $saved_form = save_form();
@@
-48,6
+50,9
@@
sub action_report_generator_export_as_pdf {
sub action_report_generator_export_as_csv {
my ($self) = @_;
sub action_report_generator_export_as_csv {
my ($self) = @_;
+
+ delete $::form->{action_report_generator_export_as_csv};
+
if ($::form->{report_generator_csv_options_set}) {
$self->report_generator_do('CSV');
return;
if ($::form->{report_generator_csv_options_set}) {
$self->report_generator_do('CSV');
return;
@@
-92,7
+97,7
@@
sub report_generator_list_objects {
$params{layout} //= 1;
my $column_defs = $params{report}->{columns};
$params{layout} //= 1;
my $column_defs = $params{report}->{columns};
- my @columns = $params{report}->get_visible_columns;
+ my @columns = $params{report}->get_visible_columns
('HTML')
;
for my $obj (@{ $params{objects} || [] }) {
my %data = map {
for my $obj (@{ $params{objects} || [] }) {
my %data = map {