mirror of
https://github.com/MrUnknownDE/panel.git
synced 2026-04-15 12:53:44 +02:00
Merge branch 'develop' into feature/react-admin
This commit is contained in:
@@ -37,7 +37,7 @@ class BackupStatusController extends Controller
|
||||
/** @var \Pterodactyl\Models\Backup $model */
|
||||
$model = Backup::query()->where('uuid', $backup)->firstOrFail();
|
||||
|
||||
if (!is_null($model->completed_at)) {
|
||||
if ($model->is_successful) {
|
||||
throw new BadRequestHttpException('Cannot update the status of a backup that is already marked as completed.');
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ class BackupStatusController extends Controller
|
||||
$audit->is_system = true;
|
||||
$audit->metadata = ['backup_uuid' => $model->uuid];
|
||||
|
||||
$successful = $request->input('successful') ? true : false;
|
||||
$successful = $request->boolean('successful');
|
||||
$model->fill([
|
||||
'is_successful' => $successful,
|
||||
// Change the lock state to unlocked if this was a failed backup so that it can be
|
||||
|
||||
Reference in New Issue
Block a user