Projects auf getmodels

diff --git a/SL/Controller/Project.pm b/SL/Controller/Project.pm
index 7d66f35937c90779b892bff27da9a470806a602a..720c93dabfbe629b47d20e74c6bc8d7e5b0b1352 100644 (file)
--- a/SL/Controller/Project.pm
+++ b/SL/Controller/Project.pm
@@ -7,9 +7,6 @@ use parent qw(SL::Controller::Base);
 use Clone qw(clone);
 
 use SL::Controller::Helper::GetModels;
 use Clone qw(clone);
 
 use SL::Controller::Helper::GetModels;

-use SL::Controller::Helper::Paginated;
-use SL::Controller::Helper::Sorted;
-use SL::Controller::Helper::Filtered;

 use SL::Controller::Helper::ParseFilter;
 use SL::Controller::Helper::ReportGenerator;
 use SL::CVar;
 use SL::Controller::Helper::ParseFilter;
 use SL::Controller::Helper::ReportGenerator;
 use SL::CVar;


@@ -25,36 +22,12 @@ use SL::Locale::String;
 use Rose::Object::MakeMethods::Generic
 (
  scalar => [ qw(project linked_records) ],
 use Rose::Object::MakeMethods::Generic
 (
  scalar => [ qw(project linked_records) ],

+ 'scalar --get_set_init' => [ qw(models) ],

 );
 
 __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('load_project', only => [ qw(edit update destroy) ]);
 
 );
 
 __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('load_project', only => [ qw(edit update destroy) ]);
 

-__PACKAGE__->make_filtered(
-  MODEL         => 'Project',
-  LAUNDER_TO    => 'filter',
-  ONLY          => [ qw(list) ],
-);
-__PACKAGE__->make_paginated(
-  MODEL         => 'Project',
-#  PAGINATE_ARGS => 'db_args',
-  ONLY          => [ qw(list) ],
-);
-
-__PACKAGE__->make_sorted(
-  MODEL         => 'Project',
-  ONLY          => [ qw(list) ],
-
-  DEFAULT_BY    => 'projectnumber',
-  DEFAULT_DIR   => 1,
-
-  customer      => t8('Customer'),
-  description   => t8('Description'),
-  projectnumber => t8('Project Number'),
-  type          => t8('Type'),
-);
-
-

 #
 # actions
 #
 #
 # actions
 #


@@ -78,9 +51,7 @@ sub action_list {
 
   # $self->make_filter_summary;
 
 
   # $self->make_filter_summary;
 

-  my $projects = $self->get_models(
-    with_objects => [ 'customer' ],
-  );
+  my $projects = $self->models->get;

 
   $self->prepare_report;
 
 
   $self->prepare_report;
 


@@ -210,7 +181,7 @@ sub setup_db_args_from_filter {
 sub prepare_report {
   my ($self)      = @_;
 
 sub prepare_report {
   my ($self)      = @_;
 

-  my $callback    = $self->get_callback;
+  my $callback    = $self->models->get_callback;

 
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;


@@ -229,7 +200,7 @@ sub prepare_report {
                        text => $::locale->text('Valid')  },
   );
 
                        text => $::locale->text('Valid')  },
   );
 

-  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,
 
   $report->set_options(
     std_column_visibility => 1,


@@ -245,9 +216,32 @@ sub prepare_report {
   $report->set_column_order(@columns);
   $report->set_export_options(qw(list filter));
   $report->set_options_from_form;
   $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->models->disable_pagination if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
+  $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable);
+  $report->set_options(
+    top_info_text         => $::locale->text('Projects'),
+    raw_bottom_info_text  => $self->render('project/report_bottom', { output => 0 }),
+  );
+}

 
 

-  $self->disable_pagination if $report->{options}{output_format} =~ /^(pdf|csv)$/i;
+sub init_models {
+  my ($self) = @_;
+
+  SL::Controller::Helper::GetModels->new(
+    controller => $self,
+    model  => 'Project',
+    sorted => {
+      _default => {
+        by    => 'projectnumber',
+        dir   => 1,
+      },
+      customer      => t8('Customer'),
+      description   => t8('Description'),
+      projectnumber => t8('Project Number'),
+      type          => t8('Type'),
+    },
+    with_objects => [ 'customer' ],
+  );

 }
 
 1;
 }
 
 1;

diff --git a/templates/webpages/project/report_bottom.html b/templates/webpages/project/report_bottom.html
index 79e152304249164a97de007b5cf74c76e11ea43f..8868ff1e63330cd8d7ce19d93c946798b0e5e5e0 100644 (file)
--- a/templates/webpages/project/report_bottom.html
+++ b/templates/webpages/project/report_bottom.html
@@ -1,2 +1,2 @@
 [% USE L %]
 [% USE L %]

-[%- L.paginate_controls %]
+[%- L.paginate_controls(models=SELF.models) %]