X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FBackgroundJob.pm;h=27a1c69a62f45d0c7d0d7e93ef36838a2af63755;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=1e73e1e2935e5c39070a1b08c9aa32548959423b;hpb=2394dc67bf4994673afcec18ea3c2e1aaed787f5;p=kivitendo-erp.git diff --git a/SL/Controller/BackgroundJob.pm b/SL/Controller/BackgroundJob.pm index 1e73e1e29..27a1c69a6 100644 --- a/SL/Controller/BackgroundJob.pm +++ b/SL/Controller/BackgroundJob.pm @@ -8,6 +8,7 @@ use SL::BackgroundJob::Base; use SL::Controller::Helper::GetModels; use SL::DB::BackgroundJob; use SL::Helper::Flash; +use SL::JSON; use SL::Locale::String; use SL::System::TaskServer; @@ -55,7 +56,8 @@ sub action_edit { sub action_edit_as_new { my ($self) = @_; - $self->background_job($self->background_job->clone_and_reset); + delete $::form->{background_job}->{id}; + $self->background_job(SL::DB::BackgroundJob->new(%{ $::form->{background_job} })); $self->action_new; } @@ -117,6 +119,33 @@ sub action_execute { back_to => $self->url_for(action => 'edit', id => $self->background_job->id)); } +sub action_execute_class { + my ($self) = @_; + + my $result; + + my $ok = eval { + die "no class name given in parameter 'class'" if !$::form->{class} || ($::form->{class} =~ m{[^a-z0-9]}i); + die "invalid class" if ! -f "SL/BackgroundJob/" . $::form->{class} . ".pm"; + + my $package = "SL::BackgroundJob::" . $::form->{class}; + + eval "require $package" or die $@; + my $job = SL::DB::BackgroundJob->new(data => $::form->{data}); + $job->data(decode_json($::form->{json_data})) if $::form->{json_data}; + $result = $package->new->run($job); + + 1; + }; + + my $reply = { + status => $ok ? 'succeeded' : 'failed', + result => $ok ? $result : $@, + }; + + $self->render(\to_json($reply), { type => 'json' }); +} + # # filters #