StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

backups: default is_successful to false (#3522)

Browse source 
* backups: default is_successful to false
* backups: properly query backups
This commit is contained in:
Matthew Penner 2021-08-03 20:45:25 -06:00 • committed by GitHub
parent b19a1640f0
commit 970f281859
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 54 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/Client/Servers/BackupController.php
View file

@ -225,7 +225,7 @@ class BackupController extends ClientApiController
throw new BadRequestHttpException('This server is not currently in a state that allows for a backup to be restored.');
}
if (!$backup->is_successful && !$backup->completed_at) {
if (!$backup->is_successful && is_null($backup->completed_at)) {
throw new BadRequestHttpException('This backup cannot be restored at this time: not completed or failed.');
}

2
app/Http/Requests/Api/Remote/ReportBackupCompleteRequest.php
View file

@ -12,7 +12,7 @@ class ReportBackupCompleteRequest extends FormRequest
public function rules()
{
return [
'successful' => 'present|boolean',
'successful' => 'required|boolean',
'checksum' => 'nullable|string|required_if:successful,true',
'checksum_type' => 'nullable|string|required_if:successful,true',
'size' => 'nullable|numeric|required_if:successful,true',