diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php index 0afc9123a..0d7d7755f 100644 --- a/app/Livewire/Project/Application/Heading.php +++ b/app/Livewire/Project/Application/Heading.php @@ -90,12 +90,12 @@ class Heading extends Component force_rebuild: $force_rebuild, ); - return redirect()->route('project.application.deployment.show', [ + return $this->redirectRoute('project.application.deployment.show', [ 'project_uuid' => $this->parameters['project_uuid'], 'application_uuid' => $this->parameters['application_uuid'], 'deployment_uuid' => $this->deploymentUuid, 'environment_uuid' => $this->parameters['environment_uuid'], - ]); + ], navigate: true); } protected function setDeploymentUuid() @@ -132,12 +132,12 @@ class Heading extends Component restart_only: true, ); - return redirect()->route('project.application.deployment.show', [ + return $this->redirectRoute('project.application.deployment.show', [ 'project_uuid' => $this->parameters['project_uuid'], 'application_uuid' => $this->parameters['application_uuid'], 'deployment_uuid' => $this->deploymentUuid, 'environment_uuid' => $this->parameters['environment_uuid'], - ]); + ], navigate: true); } public function render() diff --git a/resources/views/livewire/project/database/import.blade.php b/resources/views/livewire/project/database/import.blade.php index 795c0a420..37c1d4eb5 100644 --- a/resources/views/livewire/project/database/import.blade.php +++ b/resources/views/livewire/project/database/import.blade.php @@ -55,9 +55,15 @@ wire:model='restoreCommandText'> @else +
+ You can add "--clean" to drop objects before creating them, avoiding + conflicts. + You can add "--verbose" to log more things. +
@endif -
- +
+
@elseif ($resource->type() === 'standalone-mysql') @if ($dumpAll) @@ -66,8 +72,9 @@ @else @endif -
- +
+
@elseif ($resource->type() === 'standalone-mariadb') @if ($dumpAll) @@ -76,8 +83,9 @@ @else @endif -
- +
+
@endif

Backup File