From 01b4dbba71e67c84fc94daa1a54d7b2fddd1ce55 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Wed, 11 Dec 2024 11:20:32 +0100 Subject: [PATCH] :goal_net: Fast setup error display --- .../templates/SelectUpdateFile.ready.js.twig | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig b/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig index 1e731f6c4..ae91330db 100644 --- a/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig +++ b/datamodels/2.x/itop-core-update/templates/SelectUpdateFile.ready.js.twig @@ -134,6 +134,11 @@ $("#launch-fast-setup").on("click", function(e) { route: "core_update_ajax.rebuild_toolkit_environment" }, dataType: "json", + complete: function(jqXHR, textStatus) { + $("#fast-setup-wait").addClass("ibo-is-hidden"); + $("#launch-fast-setup").prop("disabled", false); + fast_setup_wait.addClass("ibo-is-hidden"); + }, success: function (data) { oMessage.removeClass("ibo-is-information"); @@ -144,10 +149,11 @@ $("#launch-fast-setup").on("click", function(e) { oMessage.addClass("ibo-is-failure"); oContent.html(data.sError); } - - $("#fast-setup-wait").addClass("ibo-is-hidden"); - $("#launch-fast-setup").prop("disabled", false); - fast_setup_wait.addClass("ibo-is-hidden"); + }, + error: function(jqXHR, textStatus, errorThrown) { + oMessage.removeClass("ibo-is-information"); + oMessage.addClass("ibo-is-failure"); + oContent.html(textStatus + ' ' + errorThrown); } });