BackgroundJobHistory getmodels

diff --git a/SL/Controller/BackgroundJobHistory.pm b/SL/Controller/BackgroundJobHistory.pm
index 5b0cd8fae37012c380bf6642ab0f30488662f323..850d4641f2426e4f1d1d6e841c2f030b7e280b88 100644 (file)
--- a/SL/Controller/BackgroundJobHistory.pm
+++ b/SL/Controller/BackgroundJobHistory.pm
@@ -4,10 +4,7 @@ use strict;
 
 use parent qw(SL::Controller::Base);
 
 
 use parent qw(SL::Controller::Base);
 

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

 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::GetModels;

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

 use SL::DB::BackgroundJobHistory;
 use SL::Helper::Flash;
 use SL::Locale::String;
 use SL::DB::BackgroundJobHistory;
 use SL::Helper::Flash;
 use SL::Locale::String;


@@ -15,30 +12,14 @@ use SL::System::TaskServer;
 
 use Rose::Object::MakeMethods::Generic
 (
 
 use Rose::Object::MakeMethods::Generic
 (

-  scalar                  => [ qw(history db_args flat_filter filter_summary) ],
-  'scalar --get_set_init' => [ qw(task_server) ],
+  scalar                  => [ qw(history filter_summary) ],
+  'scalar --get_set_init' => [ qw(task_server models) ],

 );
 
 __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('add_stylesheet');
 __PACKAGE__->run_before('check_task_server');
 
 );
 
 __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('add_stylesheet');
 __PACKAGE__->run_before('check_task_server');
 

-__PACKAGE__->make_filtered(
-  MODEL             => 'BackgroundJobHistory',
-  LAUNDER_TO        => 'filter'
-);
-__PACKAGE__->make_paginated(ONLY => [ qw(list) ]);
-
-__PACKAGE__->make_sorted(
-  ONLY         => [ qw(list) ],
-
-  package_name => t8('Package name'),
-  run_at       => t8('Run at'),
-  status       => t8('Execution status'),
-  result       => t8('Result'),
-  error        => t8('Error'),
-);
-

 #
 # actions
 #
 #
 # actions
 #


@@ -50,7 +31,8 @@ sub action_list {
 
   $self->render('background_job_history/list',
                 title   => $::locale->text('Background job history'),
 
   $self->render('background_job_history/list',
                 title   => $::locale->text('Background job history'),

-                ENTRIES => $self->get_models);
+                ENTRIES => $self->models->get,
+                MODELS  => $self->models);

 }
 
 sub action_show {
 }
 
 sub action_show {


@@ -114,4 +96,20 @@ sub make_filter_summary {
   $self->filter_summary(join(', ', @filter_strings));
 }
 
   $self->filter_summary(join(', ', @filter_strings));
 }
 

+sub init_models {
+  my ($self) = @_;
+
+  SL::Controller::Helper::GetModels->new(
+    controller => $self,
+    model  => 'BackgroundJobHistory',
+    sorted => {
+      package_name => t8('Package name'),
+      run_at       => t8('Run at'),
+      status       => t8('Execution status'),
+      result       => t8('Result'),
+      error        => t8('Error'),
+    },
+  );
+}
+

 1;
 1;

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 97c0159cc77ac2f0ff2d2b24f2aa2f27d79d1ea2..c8b0c311b3cbd441d458f8a14837c44644555366 100644 (file)
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -71,7 +71,7 @@ sub action_part_picker_result {
 }
 
 sub init_parts {
 }
 
 sub init_parts {

-  $_[0]->models->get (with_objects => [ qw(unit_obj) ]);
+  $_[0]->models->get;

 }
 
 sub init_models {
 }
 
 sub init_models {


@@ -86,7 +86,8 @@ sub init_models {
         dir  => 1,
       },
       partnumber  => t8('Partnumber'),
         dir  => 1,
       },
       partnumber  => t8('Partnumber'),

-    }
+    },
+    with_objects => [ qw(unit_obj) ],

   );
 }
 
   );
 }
 

diff --git a/SL/Template/Plugin/L.pm b/SL/Template/Plugin/L.pm
index 31d9a8f646e817a34f9de4e432c95f05a982f8a3..3cde38482b5919319bf8d54461e0febe98af8c35 100644 (file)
--- a/SL/Template/Plugin/L.pm
+++ b/SL/Template/Plugin/L.pm
@@ -479,7 +479,7 @@ sub paginate_controls {
       $url_params{ $pager->form_params->[0] } = delete $url_params{page};
       $url_params{ $pager->form_params->[1] } = delete $url_params{per_page} if exists $url_params{per_page};
 
       $url_params{ $pager->form_params->[0] } = delete $url_params{page};
       $url_params{ $pager->form_params->[1] } = delete $url_params{per_page} if exists $url_params{per_page};
 

-      return $params{models}->get_callback(%url_params);
+      return $models->get_callback(%url_params);

     },
     %params,
   );
     },
     %params,
   );