Fix handling for backups; correctly send along ignored files & directories

This commit is contained in:
Dane Everitt 2020-04-18 23:26:59 -07:00
parent b6a0cca0f9
commit 00b0d30c60
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
8 changed files with 31 additions and 16 deletions

View file

@ -87,7 +87,9 @@ class BackupController extends ClientApiController
}
$backup = $this->initiateBackupService
->setIgnoredFiles($request->input('ignored'))
->setIgnoredFiles(
explode(PHP_EOL, $request->input('ignored') ?? '')
)
->handle($server, $request->input('name'));
return $this->fractal->item($backup)

View file

@ -22,7 +22,7 @@ class StoreBackupRequest extends ClientApiRequest
{
return [
'name' => 'nullable|string|max:255',
'ignore' => 'nullable|string',
'ignored' => 'nullable|string',
];
}
}

View file

@ -13,8 +13,8 @@ class ReportBackupCompleteRequest extends FormRequest
{
return [
'successful' => 'boolean',
'checksum' => 'string|required_if:successful,true',
'size' => 'numeric|required_if:successful,true',
'checksum' => 'nullable|string|required_if:successful,true',
'size' => 'nullable|numeric|required_if:successful,true',
];
}
}