yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes package installer path redirect when installing from the repo

Browse Source
This commit is contained in:
Shannon
2014-01-20 11:58:52 +11:00
parent 1ad05fbfc9
commit eb44480fdf
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
View File

@@ -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;