X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBackgroundJob.pm;h=b688297971b088d392a8f0fb332c09bb545d4c5f;hb=680c9d5c8ed0bd4101384ca1b89a9405b8c2c49e;hp=7729dafe1684a364212f97b13f7638b621fd63c6;hpb=4fa7102b36468079313df9e579f7537d49aab859;p=kivitendo-erp.git

diff --git a/SL/Controller/BackgroundJob.pm b/SL/Controller/BackgroundJob.pm
index 7729dafe1..b68829797 100644
--- a/SL/Controller/BackgroundJob.pm
+++ b/SL/Controller/BackgroundJob.pm
@@ -4,9 +4,8 @@ use strict;
 
 use parent qw(SL::Controller::Base);
 
+use SL::BackgroundJob::Base;
 use SL::Controller::Helper::GetModels;
-use SL::Controller::Helper::Paginated;
-use SL::Controller::Helper::Sorted;
 use SL::DB::BackgroundJob;
 use SL::Helper::Flash;
 use SL::Locale::String;
@@ -15,26 +14,13 @@ use SL::System::TaskServer;
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(background_job) ],
-  'scalar --get_set_init' => [ qw(task_server back_to) ],
+  'scalar --get_set_init' => [ qw(task_server back_to models) ],
 );
 
 __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('check_task_server');
 __PACKAGE__->run_before('load_background_job', only => [ qw(edit update destroy execute) ]);
 
-__PACKAGE__->make_paginated(ONLY => [ qw(list) ]);
-
-__PACKAGE__->make_sorted(
-  ONLY         => [ qw(list) ],
-
-  package_name => t8('Package name'),
-  type         => t8('Execution type'),
-  active       => t8('Active'),
-  cron_spec    => t8('Execution schedule'),
-  last_run_at  => t8('Last run at'),
-  next_run_at  => t8('Next run at'),
-);
-
 #
 # actions
 #
@@ -44,19 +30,25 @@ sub action_list {
 
   $self->render('background_job/list',
                 title           => $::locale->text('Background jobs'),
-                BACKGROUND_JOBS => $self->get_models);
+                BACKGROUND_JOBS => $self->models->get,
+                MODELS          => $self->models);
 }
 
 sub action_new {
   my ($self) = @_;
 
-  $self->background_job(SL::DB::BackgroundJob->new(cron_spec => '* * * * *'));
-  $self->render('background_job/form', title => $::locale->text('Create a new background job'));
+  $self->background_job(SL::DB::BackgroundJob->new(cron_spec => '* * * * *',  package_name => 'Test'));
+  $self->render('background_job/form',
+                title       => $::locale->text('Create a new background job'),
+                JOB_CLASSES => [ SL::BackgroundJob::Base->get_known_job_classes ]);
 }
 
 sub action_edit {
   my ($self) = @_;
-  $self->render('background_job/form', title => $::locale->text('Edit background job'));
+
+  $self->render('background_job/form',
+                title       => $::locale->text('Edit background job'),
+                JOB_CLASSES => [ SL::BackgroundJob::Base->get_known_job_classes ]);
 }
 
 sub action_create {
@@ -86,6 +78,7 @@ sub action_destroy {
 sub action_save_and_execute {
   my ($self) = @_;
 
+  $self->background_job(SL::DB::BackgroundJob->new) if !$self->background_job;
   return unless $self->create_or_update;
   $self->action_execute;
 }
@@ -162,4 +155,22 @@ sub init_back_to {
   return $::form->{back_to} || $self->url_for(action => 'list');
 }
 
+sub init_models {
+  SL::Controller::Helper::GetModels->new(
+    controller => $_[0],
+    filtered => 0,
+    sorted => {
+      package_name => t8('Package name'),
+      type         => t8('Execution type'),
+      active       => t8('Active'),
+      cron_spec    => t8('Execution schedule'),
+      last_run_at  => t8('Last run at'),
+      next_run_at  => t8('Next run at'),
+    },
+    query => [
+      package_name => [ SL::BackgroundJob::Base->get_known_job_classes ],
+    ],
+  );
+}
+
 1;