Fixes routing for installer to use an area, fixes URL generation

This commit is contained in:
Shannon
2020-05-12 17:10:02 +10:00
parent 8a7bc5d3d2
commit f427059d41
8 changed files with 30 additions and 41 deletions

View File

@@ -14,12 +14,10 @@ namespace Umbraco.Web.Common.Install
{
/// <summary>
/// The MVC Installation controller
/// The Installation controller
/// </summary>
/// <remarks>
/// NOTE: All views must have their full paths as we do not have a custom view engine for the installation views!
/// </remarks>
[InstallAuthorize]
[Area(Umbraco.Core.Constants.Web.Mvc.InstallArea)]
public class InstallController : Controller
{
private readonly IUmbracoContextAccessor _umbracoContextAccessor;
@@ -72,7 +70,7 @@ namespace Umbraco.Web.Common.Install
}
// gen the install base urlAddUmbracoCore
ViewData.SetInstallApiBaseUrl(Url.GetUmbracoApiService("GetSetup", "InstallApi", "UmbracoInstall").TrimEnd("GetSetup"));
ViewData.SetInstallApiBaseUrl(Url.GetUmbracoApiService("GetSetup", "InstallApi", Umbraco.Core.Constants.Web.Mvc.InstallArea).TrimEnd("GetSetup"));
// get the base umbraco folder
ViewData.SetUmbracoBaseFolder(_hostingEnvironment.ToAbsolute(_globalSettings.UmbracoPath));
@@ -81,7 +79,6 @@ namespace Umbraco.Web.Common.Install
await _installHelper.InstallStatus(false, "");
// always ensure full path (see NOTE in the class remarks)
return View();
}
}