From eb44480fdffa302eb9bf46f025c4b6cbca166703 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 20 Jan 2014 11:58:52 +1100
Subject: [PATCH] fixes package installer path redirect when installing from
 the repo

---
 .../umbraco/developer/Packages/installer.aspx     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
index 88750a011d..0aae25a974 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
@@ -261,11 +261,7 @@
         <cc1:Pane ID="pane_optional" runat="server" Visible="false" />
         <cc1:Pane ID="pane_success" runat="server" Text="Package is installed" Visible="false">
             <cc1:PropertyPanel runat="server">
-                
-                <script type="text/javascript">
-                //UmbClientMgr.mainWindow().UmbClientMgr._packageInstalled();
-                </script>
-
+              
                 <p>
                     All items in the package has been installed</p>
                 <p>
@@ -290,16 +286,17 @@
                     
                     //This is all a bit zany with double encoding because we have a URL in a hash (#) url part
                     // but it works and maintains query strings
-                    
+
                     var refreshQuery = decodeURIComponent("<%=RefreshQueryString%>");
                     var umbPath = "<%=GlobalSettings.Path%>";
                     setTimeout(function () {
 
                         var mainWindow = UmbClientMgr.mainWindow();
 
-                        var refreshUrl = mainWindow.location.href +
-                            encodeURIComponent(encodeURIComponent("?" + refreshQuery));
-                        
+                        var baseUrl = mainWindow.location.href.substr(0, mainWindow.location.href.indexOf("#/developer/framed/"));
+                        var framedUrl = baseUrl + "#/developer/framed/";
+                        var refreshUrl = framedUrl + encodeURIComponent(encodeURIComponent(umbPath + "/developer/packages/installer.aspx?" + refreshQuery));
+
                         var redirectUrl = umbPath + "/ClientRedirect.aspx?redirectUrl=" + refreshUrl;
 
                         mainWindow.location.href = redirectUrl;