From 9a130f5869e6afea66f3c4edf728dec344993579 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Thu, 24 Oct 2019 09:36:18 -0400 Subject: [PATCH] Merge pull request #542 from grafixeyehero/wizardfinsih Improve wizard finish page redirect (cherry picked from commit 5eb6a4b5ba9512261c3afd677e7d36eafc2b4f0a) Signed-off-by: Joshua Boniface --- src/controllers/wizardfinishpage.js | 8 +------- src/wizardfinish.html | 10 ++++++++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/controllers/wizardfinishpage.js b/src/controllers/wizardfinishpage.js index 417b2425a5..ab3d269dea 100644 --- a/src/controllers/wizardfinishpage.js +++ b/src/controllers/wizardfinishpage.js @@ -6,17 +6,11 @@ define(["loading"], function(loading) { url: ApiClient.getUrl("Startup/Complete"), type: "POST" }).then(function() { - Dashboard.navigate("dashboard.html"); loading.hide(); + window.location.href = "index.html"; }); } return function(view, params) { view.querySelector(".btnWizardNext").addEventListener("click", onFinish); - view.addEventListener("viewshow", function() { - document.querySelector(".skinHeader").classList.add("noHomeButtonHeader") - }); - view.addEventListener("viewhide", function() { - document.querySelector(".skinHeader").classList.remove("noHomeButtonHeader") - }); }; }); diff --git a/src/wizardfinish.html b/src/wizardfinish.html index 0e68f88854..2c01ec22b8 100644 --- a/src/wizardfinish.html +++ b/src/wizardfinish.html @@ -10,8 +10,14 @@

${WizardCompleted}

- - + +