projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kivi.Validator: In OE Suche und Normaler Maske als check registriert
[kivitendo-erp.git]
/
SL
/
Controller
/
BackgroundJob.pm
diff --git
a/SL/Controller/BackgroundJob.pm
b/SL/Controller/BackgroundJob.pm
index
33da8b1
..
7e16a17
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
@@
-38,7
+36,7
@@
sub action_list {
sub action_new {
my ($self) = @_;
sub action_new {
my ($self) = @_;
- $self->background_job(SL::DB::BackgroundJob->new(cron_spec => '* * * * *', package_name => 'Test'));
+ $self->background_job(SL::DB::BackgroundJob->new(cron_spec => '* * * * *', package_name => 'Test'))
unless $self->background_job
;
$self->setup_form_action_bar;
$self->render('background_job/form',
title => $::locale->text('Create a new background job'),
$self->setup_form_action_bar;
$self->render('background_job/form',
title => $::locale->text('Create a new background job'),
@@
-54,6
+52,14
@@
sub action_edit {
JOB_CLASSES => [ SL::BackgroundJob::Base->get_known_job_classes ]);
}
JOB_CLASSES => [ SL::BackgroundJob::Base->get_known_job_classes ]);
}
+sub action_edit_as_new {
+ my ($self) = @_;
+
+ delete $::form->{background_job}->{id};
+ $self->background_job(SL::DB::BackgroundJob->new(%{ $::form->{background_job} }));
+ $self->action_new;
+}
+
sub action_show {
my ($self) = @_;
sub action_show {
my ($self) = @_;
@@
-149,9
+155,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 {
@@
-225,11
+230,16
@@
sub setup_form_action_bar {
t8('Save and execute'),
submit => [ '#form', { action => 'BackgroundJob/save_and_execute' } ],
],
t8('Save and execute'),
submit => [ '#form', { action => 'BackgroundJob/save_and_execute' } ],
],
+ action => [
+ t8('Use as new'),
+ submit => [ '#form', { action => 'BackgroundJob/edit_as_new' } ],
+ disabled => $is_new ? t8('The object has not been saved yet.') : undef,
+ ],
], # end of combobox "Save"
action => [
t8('Delete'),
], # end of combobox "Save"
action => [
t8('Delete'),
- submit => [ '#form', { action => 'BackgroundJob/de
lete
' } ],
+ submit => [ '#form', { action => 'BackgroundJob/de
stroy
' } ],
confirm => t8('Do you really want to delete this object?'),
disabled => $is_new ? t8('This object has not been saved yet.') : undef,
],
confirm => t8('Do you really want to delete this object?'),
disabled => $is_new ? t8('This object has not been saved yet.') : undef,
],