dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'next' into docker-cleanup-executions-ui

Browse Source
This commit is contained in:
🏔️ Peak
2025-01-16 11:28:09 +01:00
committed by GitHub
parent f5bc80b580 11414d347f
commit e2a9cb61aa
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Livewire/Project/Application/Heading.php
View File

@@ -90,12 +90,12 @@ class Heading extends Component
force_rebuild: $force_rebuild, force_rebuild: $force_rebuild,
); );
return redirect()->route('project.application.deployment.show', [ return $this->redirectRoute('project.application.deployment.show', [
'project_uuid' => $this->parameters['project_uuid'], 'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'], 'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deploymentUuid, 'deployment_uuid' => $this->deploymentUuid,
'environment_uuid' => $this->parameters['environment_uuid'], 'environment_uuid' => $this->parameters['environment_uuid'],
]); ], navigate: true);
} }
protected function setDeploymentUuid() protected function setDeploymentUuid()
@@ -132,12 +132,12 @@ class Heading extends Component
restart_only: true, restart_only: true,
); );
return redirect()->route('project.application.deployment.show', [ return $this->redirectRoute('project.application.deployment.show', [
'project_uuid' => $this->parameters['project_uuid'], 'project_uuid' => $this->parameters['project_uuid'],
'application_uuid' => $this->parameters['application_uuid'], 'application_uuid' => $this->parameters['application_uuid'],
'deployment_uuid' => $this->deploymentUuid, 'deployment_uuid' => $this->deploymentUuid,
'environment_uuid' => $this->parameters['environment_uuid'], 'environment_uuid' => $this->parameters['environment_uuid'],
]); ], navigate: true);
} }
public function render() public function render()

20
resources/views/livewire/project/database/import.blade.php
View File

@@ -55,9 +55,15 @@
wire:model='restoreCommandText'></x-forms.textarea> wire:model='restoreCommandText'></x-forms.textarea>
@else @else
<x-forms.input label="Custom Import Command" wire:model='postgresqlRestoreCommand'></x-forms.input> <x-forms.input label="Custom Import Command" wire:model='postgresqlRestoreCommand'></x-forms.input>
<div class="flex flex-col gap-1 pt-1">
<span class="text-xs">You can add "--clean" to drop objects before creating them, avoiding
conflicts.</span>
<span class="text-xs">You can add "--verbose" to log more things.</span>
</div>
@endif @endif
<div class="w-48 pt-2"> <div class="w-64 pt-2">
<x-forms.checkbox label="Includes all databases" wire:model.live='dumpAll'></x-forms.checkbox> <x-forms.checkbox label="Backup includes all databases"
wire:model.live='dumpAll'></x-forms.checkbox>
</div> </div>
@elseif ($resource->type() === 'standalone-mysql') @elseif ($resource->type() === 'standalone-mysql')
@if ($dumpAll) @if ($dumpAll)
@@ -66,8 +72,9 @@
@else @else
<x-forms.input label="Custom Import Command" wire:model='mysqlRestoreCommand'></x-forms.input> <x-forms.input label="Custom Import Command" wire:model='mysqlRestoreCommand'></x-forms.input>
@endif @endif
<div class="w-48 pt-2"> <div class="w-64 pt-2">
<x-forms.checkbox label="Includes all databases" wire:model.live='dumpAll'></x-forms.checkbox> <x-forms.checkbox label="Backup includes all databases"
wire:model.live='dumpAll'></x-forms.checkbox>
</div> </div>
@elseif ($resource->type() === 'standalone-mariadb') @elseif ($resource->type() === 'standalone-mariadb')
@if ($dumpAll) @if ($dumpAll)
@@ -76,8 +83,9 @@
@else @else
<x-forms.input label="Custom Import Command" wire:model='mariadbRestoreCommand'></x-forms.input> <x-forms.input label="Custom Import Command" wire:model='mariadbRestoreCommand'></x-forms.input>
@endif @endif
<div class="w-48 pt-2"> <div class="w-64 pt-2">
<x-forms.checkbox label="Includes all databases" wire:model.live='dumpAll'></x-forms.checkbox> <x-forms.checkbox label="Backup includes all databases"
wire:model.live='dumpAll'></x-forms.checkbox>
</div> </div>
@endif @endif
<h3 class="pt-6">Backup File</h3> <h3 class="pt-6">Backup File</h3>