From 876336d9fde084992922e8e906b44b8a4d35cacb Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 18 Feb 2019 15:02:38 +1100 Subject: [PATCH] Fixes more of #4478 --- .../src/views/packages/overview.controller.js | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js index e1b12be4a2..b2661f6d9f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packages/overview.controller.js @@ -13,24 +13,27 @@ let packageUri = $routeParams.method; if (packageInstallData) { - localStorageService.remove("packageInstallData"); + localStorageService.remove("packageInstallData"); + + if (packageInstallData.postInstallationPath) { + //navigate to the custom installer screen if set + $location.path(packageInstallData.postInstallationPath).search("packageId", packageInstallData.id); + return; + } + + //if it is "installed" then set the uri/path to that + if (packageInstallData === "installed") { + packageUri = "installed"; + } } - if (packageInstallData && packageInstallData !== "installed" && packageInstallData.postInstallationPath) { - //navigate to the custom installer screen, if it is just "installed" it means there is no custom installer screen - $location.path(packageInstallData.postInstallationPath).search("packageId", packageInstallData.id); - } - else { - var vm = this; - vm.page = {}; - vm.page.labels = {}; - vm.page.name = ""; - vm.page.navigation = []; + var vm = this; + vm.page = {}; + vm.page.labels = {}; + vm.page.name = ""; + vm.page.navigation = []; - packageUri = packageInstallData ? packageInstallData : packageUri; //use the path stored in storage over the one in the current path - - onInit(); - } + onInit(); function onInit() {