X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBackgroundJob.pm;h=797797782fc421460e13d19b026ce29daa063ef9;hb=8a40e3dd0f638557b8c666fe708ccbc1ac709c4e;hp=57ec5c377bac1876bdcbbddacd12665037ca430b;hpb=5f49de40a2c8c6eca92bb3fd88c1ee0126264bd1;p=kivitendo-erp.git

diff --git a/SL/Controller/BackgroundJob.pm b/SL/Controller/BackgroundJob.pm
index 57ec5c377..797797782 100644
--- a/SL/Controller/BackgroundJob.pm
+++ b/SL/Controller/BackgroundJob.pm
@@ -4,20 +4,38 @@ 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;
 use SL::System::TaskServer;
 
 use Rose::Object::MakeMethods::Generic
 (
   scalar                  => [ qw(background_job) ],
-  'scalar --get_set_init' => [ qw(task_server) ],
+  'scalar --get_set_init' => [ qw(task_server back_to) ],
 );
 
 __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
 #
@@ -27,19 +45,24 @@ sub action_list {
 
   $self->render('background_job/list',
                 title           => $::locale->text('Background jobs'),
-                BACKGROUND_JOBS => SL::DB::Manager::BackgroundJob->get_all_sorted);
+                BACKGROUND_JOBS => $self->get_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 {
@@ -63,7 +86,7 @@ sub action_destroy {
     flash_later('error', $::locale->text('The background job could not be destroyed.'));
   }
 
-  $self->redirect_to(action => 'list');
+  $self->redirect_to($self->back_to);
 }
 
 sub action_save_and_execute {
@@ -123,7 +146,7 @@ sub create_or_update {
   flash_later('info', $is_new ? $::locale->text('The background job has been created.') : $::locale->text('The background job has been saved.'));
   return if $return;
 
-  $self->redirect_to(action => 'list');
+  $self->redirect_to($self->back_to);
 }
 
 sub load_background_job {
@@ -140,4 +163,9 @@ sub check_task_server {
   flash('warning', $::locale->text('The task server does not appear to be running.')) if !$self->task_server->is_running;
 }
 
+sub init_back_to {
+  my ($self) = @_;
+  return $::form->{back_to} || $self->url_for(action => 'list');
+}
+
 1;