Hintergrundjobs: »Speichern & Ausführen« darf keinen neuen Job anlegen

Siehe #256.

diff --git a/SL/Controller/BackgroundJob.pm b/SL/Controller/BackgroundJob.pm
index 37f2d97558b8c67edbdf6571592e60840590db14..272e5cba0a2bb55db34f8701adffc794799c591a 100644 (file)
--- a/SL/Controller/BackgroundJob.pm
+++ b/SL/Controller/BackgroundJob.pm
@@ -13,13 +13,11 @@ use SL::System::TaskServer;
 
 use Rose::Object::MakeMethods::Generic
 (
 
 use Rose::Object::MakeMethods::Generic
 (

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

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

-__PACKAGE__->run_before('load_background_job', only => [ qw(edit update destroy execute show) ]);

 
 #
 # actions
 
 #
 # actions


@@ -149,9 +147,8 @@ sub create_or_update {
   $self->redirect_to($self->back_to);
 }
 
   $self->redirect_to($self->back_to);
 }
 

-sub load_background_job {
-  my ($self) = @_;
-  $self->background_job(SL::DB::BackgroundJob->new(id => $::form->{id})->load);
+sub init_background_job {
+  return $::form->{id} ? SL::DB::BackgroundJob->new(id => $::form->{id})->load : undef;

 }
 
 sub init_task_server {
 }
 
 sub init_task_server {