From db3ffaf6587a64c78b4af3ad92eeaf2ad8b58f0c Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Fri, 24 Nov 2023 18:25:31 +0530 Subject: [PATCH] refactor: check for last response error Signed-off-by: Akhil Narang --- frappe/desk/page/setup_wizard/setup_wizard.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.js b/frappe/desk/page/setup_wizard/setup_wizard.js index 8d42b804cd..268d0a86bc 100644 --- a/frappe/desk/page/setup_wizard/setup_wizard.js +++ b/frappe/desk/page/setup_wizard/setup_wizard.js @@ -196,7 +196,7 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { this.abort_setup(r.message.fail); } }, - error: () => this.abort_setup("Error in setup"), + error: () => this.abort_setup(), }); } @@ -213,7 +213,11 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides { abort_setup(fail_msg) { this.$working_state.find(".state-icon-container").html(""); - fail_msg = fail_msg ? fail_msg : __("Failed to complete setup"); + fail_msg = fail_msg + ? fail_msg + : frappe.last_response.setup_wizard_failure_message + ? frappe.last_response.setup_wizard_failure_message + : __("Failed to complete setup"); this.update_setup_message("Could not start up: " + fail_msg);