X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FRequirementSpec.pm;h=7e25d7e7ded7c73c58b6c02ca04010e177627157;hb=afb8e14695ac06126fff2084b3b67d517663f9f6;hp=b389ba37319e29e44f3feda89b933c93e8ee1b47;hpb=1ae686100b75daf4590311ba74f8884f32df562e;p=kivitendo-erp.git

diff --git a/SL/Controller/RequirementSpec.pm b/SL/Controller/RequirementSpec.pm
index b389ba373..7e25d7e7d 100644
--- a/SL/Controller/RequirementSpec.pm
+++ b/SL/Controller/RequirementSpec.pm
@@ -10,10 +10,6 @@ use File::Spec ();
 use SL::ClientJS;
 use SL::Common ();
 use SL::Controller::Helper::GetModels;
-use SL::Controller::Helper::Filtered;
-use SL::Controller::Helper::Paginated;
-use SL::Controller::Helper::Sorted;
-use SL::Controller::Helper::ParseFilter;
 use SL::Controller::Helper::ReportGenerator;
 use SL::Controller::Helper::RequirementSpec;
 use SL::DB::Customer;
@@ -33,26 +29,13 @@ use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(requirement_spec_item visible_item visible_section) ],
   'scalar --get_set_init' => [ qw(requirement_spec customers types statuses complexities risks projects project_types project_statuses default_project_type default_project_status copy_source js
-                                  current_text_block_output_position) ],
+                                  current_text_block_output_position models) ],
 );
 
 __PACKAGE__->run_before('setup');
+__PACKAGE__->run_before('set_default_filter_args', only => [ qw(list) ]);
 
-__PACKAGE__->make_filtered(
-  MODEL      => 'RequirementSpec',
-  LAUNDER_TO => 'filter'
-);
-__PACKAGE__->make_paginated(
-  MODEL => 'RequirementSpec',
-  ONLY  => [ qw(list) ],
-);
-__PACKAGE__->make_sorted(
-  MODEL         => 'RequirementSpec',
-  ONLY          => [ qw(list) ],
-
-  DEFAULT_BY    => 'customer',
-  DEFAULT_DIR   => 1,
-
+my %sort_columns = (
   customer      => t8('Customer'),
   title         => t8('Title'),
   type          => t8('Requirement Spec Type'),
@@ -70,17 +53,8 @@ __PACKAGE__->make_sorted(
 sub action_list {
   my ($self) = @_;
 
-  my $requirement_specs = $self->get_models(
-    query => [
-      and => [
-        working_copy_id => undef,
-        is_template     => $::form->{is_template} ? 1 : 0,
-      ]],
-    with_objects => [ 'customer', 'type', 'status', 'project' ],
-  );
-
   $self->prepare_report;
-  $self->report_generator_list_objects(report => $self->{report}, objects => $requirement_specs);
+  $self->report_generator_list_objects(report => $self->{report}, objects => $self->models->get);
 }
 
 sub action_new {
@@ -89,7 +63,7 @@ sub action_new {
   $self->requirement_spec(SL::DB::RequirementSpec->new(is_template => $::form->{is_template}));
 
   if ($self->copy_source) {
-    $self->requirement_spec->$_($self->copy_source->$_) for qw(type_id status_id customer_id title hourly_rate)
+    $self->requirement_spec->$_($self->copy_source->$_) for qw(type_id status_id customer_id title hourly_rate is_template)
   }
 
   $self->render('requirement_spec/new', title => $self->requirement_spec->is_template ? t8('Create a new requirement spec template') : t8('Create a new requirement spec'));
@@ -395,10 +369,13 @@ sub create_or_update {
 sub prepare_report {
   my ($self)      = @_;
 
-  my $callback    = $self->get_callback;
-
   my $is_template = $::form->{is_template};
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
+
+  $self->models->disable_plugin('paginated') if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
+  $self->models->finalize; # for filter laundering
+  my $callback    = $self->models->get_callback;
+
   $self->{report} = $report;
 
   my @columns     = $is_template ? qw(title mtime) : qw(title customer status type projectnumber mtime version);
@@ -422,14 +399,14 @@ sub prepare_report {
     );
   }
 
-  map { $column_defs{$_}->{text} ||= $::locale->text( $self->get_sort_spec->{$_}->{title} ) } keys %column_defs;
+  map { $column_defs{$_}->{text} ||= $::locale->text( $self->models->get_sort_spec->{$_}->{title} ) } keys %column_defs;
 
   $report->set_options(
     std_column_visibility => 1,
     controller_class      => 'RequirementSpec',
     output_format         => 'HTML',
     raw_top_info_text     => $self->render('requirement_spec/report_top',    { output => 0 }, is_template => $is_template),
-    raw_bottom_info_text  => $self->render('requirement_spec/report_bottom', { output => 0 }),
+    raw_bottom_info_text  => $self->render('requirement_spec/report_bottom', { output => 0 }, models => $self->models),
     title                 => $is_template ? t8('Requirement Spec Templates') : t8('Requirement Specs'),
     allow_pdf_export      => 1,
     allow_csv_export      => 1,
@@ -438,9 +415,7 @@ sub prepare_report {
   $report->set_column_order(@columns);
   $report->set_export_options(qw(list filter));
   $report->set_options_from_form;
-  $self->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
-
-  $self->disable_pagination if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
+  $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
 }
 
 sub invalidate_version {
@@ -472,6 +447,18 @@ sub render_pasted_text_block {
     ->jstree->open_node(  '#tree', "#tb-${front_back}");
 }
 
+sub set_default_filter_args {
+  my ($self) = @_;
+
+  if (!$::form->{filter} && !$::form->{is_template}) {
+    $::form->{filter} = {
+      status_id => [ map { $_->{id} } grep { $_->name ne 'done' } @{ $self->statuses } ],
+    };
+  }
+
+  return 1;
+}
+
 sub render_pasted_section {
   my ($self, $item, $parent_id) = @_;
 
@@ -567,4 +554,26 @@ sub update_project_link_create {
     ->render($self);
 }
 
+sub init_models {
+  my ($self) = @_;
+
+  SL::Controller::Helper::GetModels->new(
+    controller   => $self,
+    sorted       => {
+      _default     => {
+        by           => 'customer',
+        dir          => 1,
+      },
+      %sort_columns,
+    },
+    query => [
+      and => [
+        working_copy_id => undef,
+        is_template     => $::form->{is_template} ? 1 : 0,
+      ],
+    ],
+    with_objects => [ 'customer', 'type', 'status', 'project' ],
+  );
+}
+
 1;