proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-08 14:05:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #3976: api/backup: make schedule/starttime truly optional on update

Browse Source 
on create we require either starttime (+dow) or a schedule, but when
updating an existing job, this is not necessary

before we changed to schedules, the starttime was not optional either on
update, but i think there is no reason to require the user to send the
schedule/startime along every time.

the gui will send all values every time, so that was never a problem there

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2022-04-01 08:14:13 +02:00 committed by Thomas Lamprecht
parent d0477f12ad
commit 81ba0803d5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/API2/Backup.pm
View File

@ -62,13 +62,14 @@ my $convert_to_schedule = sub {
}; };
my $schedule_param_check = sub { my $schedule_param_check = sub {
my ($param) = @_; my ($param, $required) = @_;
if (defined($param->{schedule})) { if (defined($param->{schedule})) {
if (defined($param->{starttime})) { if (defined($param->{starttime})) {
raise_param_exc({ starttime => "'starttime' and 'schedule' cannot both be set" }); raise_param_exc({ starttime => "'starttime' and 'schedule' cannot both be set" });
} }
} elsif (!defined($param->{starttime})) { } elsif (!defined($param->{starttime})) {
raise_param_exc({ schedule => "neither 'starttime' nor 'schedule' were set" }); raise_param_exc({ schedule => "neither 'starttime' nor 'schedule' were set" })
if $required;
} else { } else {
$param->{schedule} = $convert_to_schedule->($param); $param->{schedule} = $convert_to_schedule->($param);
} }
@ -201,7 +202,7 @@ __PACKAGE__->register_method({
$rpcenv->check($user, "/pool/$pool", ['VM.Backup']); $rpcenv->check($user, "/pool/$pool", ['VM.Backup']);
} }
$schedule_param_check->($param); $schedule_param_check->($param, 1);
$param->{enabled} = 1 if !defined($param->{enabled}); $param->{enabled} = 1 if !defined($param->{enabled});
@ -448,7 +449,7 @@ __PACKAGE__->register_method({
} }
my $schedule_updated = 0; my $schedule_updated = 0;
if ($param->{schedule} ne $job->{schedule}) { if (defined($param->{schedule}) && $param->{schedule} ne $job->{schedule}) {
$schedule_updated = 1; $schedule_updated = 1;
} }