Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

Merge remote-tracking branch 'origin/next' into pr-11784-automation/sync-main-to-next

Andras Bacsai2c1744fbd28e
diff --cc app/Livewire/Project/Database/BackupEdit.php
index 4a09fc0463,d938ebde8d..04e86e261e
--- a/app/Livewire/Project/Database/BackupEdit.php
+++ b/app/Livewire/Project/Database/BackupEdit.php
@@@ -213,15 -212,24 +213,22 @@@ class BackupEdit extends Componen
}
}
- $database = $this->backup->database;
+ $backupUuid = $this->backup->uuid;
$this->backup->delete();
+ $this->skipRender();
+ auditLog('ui.database.backup_schedule_deleted', [
+ 'team_id' => $database->team()?->id,
+ 'database_uuid' => $database->uuid,
+ 'database_name' => $database->name,
+ 'backup_uuid' => $backupUuid,
+ ]);
- if ($database->getMorphClass() === ServiceDatabase::class) {
- $serviceDatabase = $database;
-
+ if ($database instanceof ServiceDatabase) {
return redirectRoute($this, 'project.service.database.backups', [
- 'project_uuid' => $this->parameters['project_uuid'],
- 'environment_uuid' => $this->parameters['environment_uuid'],
- 'service_uuid' => $serviceDatabase->service->uuid,
- 'stack_service_uuid' => $serviceDatabase->uuid,
+ 'project_uuid' => $database->service->project()->uuid,
+ 'environment_uuid' => $database->service->environment->uuid,
+ 'service_uuid' => $database->service->uuid,
+ 'stack_service_uuid' => $database->uuid,
]);
} else {
return redirectRoute($this, 'project.database.backup.index', [