Refactoring: list_objects() aus Controllern in ReportGenerator-Helfer verschieben

[kivitendo-erp.git] / SL / Controller / Project.pm

diff --git a/SL/Controller/Project.pm b/SL/Controller/Project.pm
index 386d755..46a8c59 100644 (file)
--- a/SL/Controller/Project.pm
+++ b/SL/Controller/Project.pm
@@ -77,9 +77,9 @@ sub action_list {
 
   $self->prepare_report;
 
-  $self->{projects} = $self->get_models(%{ $self->db_args });
+  my $projects = $self->get_models(%{ $self->db_args });
 
-  $self->list_objects;
+  $self->report_generator_list_objects(report => $self->{report}, objects => $projects);
 }
 
 sub action_new {
@@ -274,31 +274,6 @@ sub prepare_report {
   $self->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
 
   $self->disable_pagination if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
-
-  $self->{report_data} = {
-    column_defs        => \%column_defs,
-    columns            => \@columns,
-  };
-}
-
-sub list_objects {
-  my ($self)      = @_;
-  my $column_defs = $self->{report_data}->{column_defs};
-
-  for my $obj (@{ $self->{projects} || [] }) {
-    my %data = map {
-      $_ => {
-        data => $column_defs->{$_}{sub} ? $column_defs->{$_}{sub}->($obj)
-              : $obj->can($_)           ? $obj->$_
-              :                           $obj->{$_},
-        link => $column_defs->{$_}{obj_link} ? $column_defs->{$_}{obj_link}->($obj) : '',
-      },
-    } @{ $self->{report_data}{columns} || {} };
-
-    $self->{report}->add_data(\%data);
-  }
-
-  return $self->{report}->generate_with_headers;
 }
 
 1;