Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/react-admin

Browse source
This commit is contained in:
Matthew Penner 2021-07-20 13:01:28 -06:00
commit d32b3a0473
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php
View file

@ -37,7 +37,7 @@ class BackupStatusController extends Controller
/** @var \Pterodactyl\Models\Backup $model */ /** @var \Pterodactyl\Models\Backup $model */
$model = Backup::query()->where('uuid', $backup)->firstOrFail(); $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.'); 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->is_system = true;
$audit->metadata = ['backup_uuid' => $model->uuid]; $audit->metadata = ['backup_uuid' => $model->uuid];
$successful = $request->input('successful') ? true : false; $successful = $request->boolean('successful');
$model->fill([ $model->fill([
'is_successful' => $successful, 'is_successful' => $successful,
// Change the lock state to unlocked if this was a failed backup so that it can be // Change the lock state to unlocked if this was a failed backup so that it can be