diff --git a/app/Livewire/Project/Database/CreateScheduledBackup.php b/app/Livewire/Project/Database/CreateScheduledBackup.php index 8c7c49c2e2..2c6854e0c0 100644 --- a/app/Livewire/Project/Database/CreateScheduledBackup.php +++ b/app/Livewire/Project/Database/CreateScheduledBackup.php @@ -82,6 +82,12 @@ class CreateScheduledBackup extends Component $payload['databases_to_backup'] = $database->clickhouse_db; } + // Odoo keeps its data in databases that the user creates in Odoo, so the database + // that the container env names (POSTGRES_DB=postgres) stays empty. + if ($database instanceof ServiceDatabase && $database->service?->service_type === 'odoo') { + $payload['dump_all'] = true; + } + $databaseBackup = ScheduledDatabaseBackup::create($payload); auditLog('ui.database.backup_schedule_created', [ 'team_id' => $database->team()?->id, diff --git a/resources/css/app.css b/resources/css/app.css index cf9ffb1fc4..7afcd691d4 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -2100,6 +2100,26 @@ html[data-theme="custom"]:not(.dark) :is(.application-settings-section, .applica padding: 1rem; } +/* Sections inside a modal well: the modal is already the card, so show each + section flat (title row and fields) with a divider between sections. */ +.modal-flat-sections .application-settings-section, +.modal-flat-sections .application-settings-section-body { + border: 0; + border-radius: 0; + background: none; + box-shadow: none; + padding: 0; +} + +.modal-flat-sections .application-settings-section > :is(header, .application-settings-section-header) { + padding-inline: 0; +} + +.modal-flat-sections .application-settings-section ~ .application-settings-section { + border-top: 1px solid var(--well-border); + padding-top: 1.5rem; +} + /* The dark well is darker than the canvas, so controls inside it use a darker, translucent fill and border (like haruvo) instead of the global opaque ones. */ .dark .application-settings-section-body { diff --git a/resources/views/livewire/project/database/backup-edit/retention.blade.php b/resources/views/livewire/project/database/backup-edit/retention.blade.php index d340216537..62c3747fa0 100644 --- a/resources/views/livewire/project/database/backup-edit/retention.blade.php +++ b/resources/views/livewire/project/database/backup-edit/retention.blade.php @@ -2,7 +2,7 @@ description="The first reached limit removes the oldest backup. Use 0 for unlimited retention.">
{{ $selectedSchedule->frequency }} schedule
-