From: soufiane Date: Mon, 29 Jul 2024 10:47:13 +0000 (+0200) Subject: wip #7008 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4c1b12d3d231e14d515203ba9c84086cc2d45663;p=fluidbook-toolbox.git wip #7008 --- diff --git a/app/Models/FluidbookExternalInstallServer.php b/app/Models/FluidbookExternalInstallServer.php index 3c565cccb..458ebc9fe 100644 --- a/app/Models/FluidbookExternalInstallServer.php +++ b/app/Models/FluidbookExternalInstallServer.php @@ -177,7 +177,9 @@ class FluidbookExternalInstallServer extends ExternalServer } else { $res['error'] = true; if($isHosting && is_array($check)) { - $res['message'] = __("La configuration des sous-domaines suivant est incorrecte : :subdomains", ["subdomains" => $check['subdomains']]); + $res['message'] = __("La configuration des sous-domaines suivants est incorrecte : :subdomains", ["subdomains" => $check['subdomains']]); + $res['message'] .= "
"; + $res['message'] .= __("Modifier la zone DNS afin que [ :subdomains ] pointe vers le serveur (CNAME :hostingname ou A :ip)", ["subdomains" => $check['subdomains'], "hostingname" => $check['host'], "ip" => gethostbyname($check['host'])]); } else { $res['message'] = static::messages()[$check]; } diff --git a/resources/views/vendor/backpack/crud/edit-external-server.blade.php b/resources/views/vendor/backpack/crud/edit-external-server.blade.php index 7432ef105..db2073ed2 100644 --- a/resources/views/vendor/backpack/crud/edit-external-server.blade.php +++ b/resources/views/vendor/backpack/crud/edit-external-server.blade.php @@ -11,13 +11,12 @@ }); function removeBtn() { - setTimeout(() => { - $("#message").remove() - }, "5000"); + $("#message").remove() } $(document).on("click", "#verifyconnection", function (e) { e.preventDefault(); + removeBtn() const data = { id: {{$entry->id}}, protocol: $('[name=protocol]').val(), @@ -37,14 +36,16 @@ let type = 'success' if (data.error) { type = 'error' + }else { + setTimeout(function(){ + removeBtn() + }, 5000) } $('#saveActions').prepend('
' + data.message + '
') - removeBtn() }, error: function (xhr) { let message = xhr.responseJSON.message ?? "{{ __('Une erreur est survenue') }}" $('#saveActions').prepend('
' + message + '
') - removeBtn() } }); })