wip #7008

diff --git a/app/Models/FluidbookExternalInstallServer.php b/app/Models/FluidbookExternalInstallServer.php
index 3c565cccbbb5b5b1d122bfa41d543f5626e85cfc..458ebc9fe0b57ccd18893bc46ad4017b3d9168bb 100644 (file)
--- 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'] .= "</br>";
+                $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 7432ef105dfdd8f78c48b5fb091f011edb7617aa..db2073ed27438d8622233070fcdee98674fedcc8 100644 (file)
--- 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('<div id="message" class="mb-3 noty_type__' + type + ' noty_theme__backstrap"><div class="p-3">' + data.message + '</div></div>')
-                        removeBtn()
                     },
                     error: function (xhr) {
                         let message = xhr.responseJSON.message ?? "{{ __('Une erreur est survenue') }}"
                         $('#saveActions').prepend('<div id="message" class="mb-3 noty_type__error noty_theme__backstrap"><div class="p-3">' + message + '</div></div>')
-                        removeBtn()
                     }
                 });
             })