rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: compose loading seq

Browse source
This commit is contained in:
Andras Bacsai 2024-12-16 10:19:11 +01:00
parent 65ba6b947a
commit acf10f39f3
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Livewire/Project/Application/General.php
View file

@ -327,7 +327,7 @@ public function checkFqdns($showToaster = true)
}
}
public function set_redirect()
public function setRedirect()
{
try {
$has_www = collect($this->application->fqdns)->filter(fn ($fqdn) => str($fqdn)->contains('www.'))->count();
@ -360,10 +360,10 @@ public function submit($showToaster = true)
if ($warning) {
$this->dispatch('warning', __('warning.sslipdomain'));
}
$this->resetDefaultLabels();
// $this->resetDefaultLabels();
if ($this->application->isDirty('redirect')) {
$this->set_redirect();
$this->setRedirect();
}
$this->checkFqdns();

5
resources/views/livewire/project/application/general.blade.php
View file

@ -84,7 +84,7 @@
<option value="non-www">Redirect to non-www.</option>
</x-forms.select>
<x-modal-confirmation title="Confirm Redirection Setting?" buttonTitle="Set Direction"
submitAction="set_redirect" :actions="['All traffic will be redirected to the selected direction.']" confirmationText="{{ $application->fqdn . '/' }}"
submitAction="setRedirect" :actions="['All traffic will be redirected to the selected direction.']" confirmationText="{{ $application->fqdn . '/' }}"
confirmationLabel="Please confirm the execution of the action by entering the Application URL below"
shortConfirmationLabel="Application URL" :confirmWithPassword="false" step2ButtonText="Set Direction">
<x-slot:customButton>
@ -161,8 +161,7 @@ class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
</div>
<div class="pt-1 text-xs">Nixpacks will detect the required configuration
automatically.
<a class="underline"
href="https://coolify.io/docs/applications">Framework
<a class="underline" href="https://coolify.io/docs/applications">Framework
Specific Docs</a>
</div>
@endif