From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 22 May 2017 08:15:54 +0000 (+0200)
Subject: Hintergrundjobs: »Speichern & Ausführen« darf keinen neuen Job anlegen
X-Git-Tag: release-3.5.4~1080
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f751112d45469757aa6eac8a540c5e298b001845;p=kivitendo-erp.git

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

Siehe #256.
---

diff --git a/SL/Controller/BackgroundJob.pm b/SL/Controller/BackgroundJob.pm
index 37f2d9755..272e5cba0 100644
--- a/SL/Controller/BackgroundJob.pm
+++ b/SL/Controller/BackgroundJob.pm
@@ -13,13 +13,11 @@ use SL::System::TaskServer;
 
 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('load_background_job', only => [ qw(edit update destroy execute show) ]);
 
 #
 # actions
@@ -149,9 +147,8 @@ sub create_or_update {
   $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 {