Skip to content

Commit eb44480

Browse files
committed
fixes package installer path redirect when installing from the repo
1 parent 1ad05fb commit eb44480

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,7 @@
261261
<cc1:Pane ID="pane_optional" runat="server" Visible="false" />
262262
<cc1:Pane ID="pane_success" runat="server" Text="Package is installed" Visible="false">
263263
<cc1:PropertyPanel runat="server">
264-
265-
<script type="text/javascript">
266-
//UmbClientMgr.mainWindow().UmbClientMgr._packageInstalled();
267-
</script>
268-
264+
269265
<p>
270266
All items in the package has been installed</p>
271267
<p>
@@ -290,16 +286,17 @@
290286
291287
//This is all a bit zany with double encoding because we have a URL in a hash (#) url part
292288
// but it works and maintains query strings
293-
289+
294290
var refreshQuery = decodeURIComponent("<%=RefreshQueryString%>");
295291
var umbPath = "<%=GlobalSettings.Path%>";
296292
setTimeout(function () {
297293
298294
var mainWindow = UmbClientMgr.mainWindow();
299295
300-
var refreshUrl = mainWindow.location.href +
301-
encodeURIComponent(encodeURIComponent("?" + refreshQuery));
302-
296+
var baseUrl = mainWindow.location.href.substr(0, mainWindow.location.href.indexOf("#/developer/framed/"));
297+
var framedUrl = baseUrl + "#/developer/framed/";
298+
var refreshUrl = framedUrl + encodeURIComponent(encodeURIComponent(umbPath + "/developer/packages/installer.aspx?" + refreshQuery));
299+
303300
var redirectUrl = umbPath + "/ClientRedirect.aspx?redirectUrl=" + refreshUrl;
304301
305302
mainWindow.location.href = redirectUrl;

0 commit comments

Comments
 (0)