From d7c98c2686d24b24955248574890d14df8a9f6cf Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 11 Jul 2016 11:31:21 +0200 Subject: [PATCH] Fixes the redirect when uninstalling, fixes the icon header width of installing a local package --- .../src/views/packager/views/install-local.html | 2 +- .../views/packager/views/installed.controller.js | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html index c8d7e9099a..acfc5572d9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/install-local.html @@ -63,7 +63,7 @@
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js index b947caa4d9..a1bc40ece0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/installed.controller.js @@ -1,7 +1,7 @@ (function () { "use strict"; - function PackagesInstalledController($scope, $route, $location, packageResource) { + function PackagesInstalledController($scope, $route, $location, packageResource, $timeout, $window, localStorageService) { var vm = this; @@ -33,12 +33,19 @@ packageResource.uninstall(installedPackage.id) .then(function () { + if (installedPackage.files.length > 0) { vm.installState.status = "All done, your browser will now refresh"; vm.installState.progress = "100"; - var url = window.location.href + "?uninstalled=" + vm.package.packageGuid; - window.location.reload(true); + //set this flag so that on refresh it shows the installed packages list + localStorageService.set("packageInstallUri", "installed"); + + //reload on next digest (after cookie) + $timeout(function () { + $window.location.reload(true); + }); + } else { init();