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

AB#6233 - Added application url on IHostingEnvironment. Still need a way to figure out how to get this value

Browse Source
This commit is contained in:
Bjarke Berg
2020-05-01 08:26:05 +02:00
parent 04872857e4
commit da1e83c0d1
24 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/installer/installer.service.js
View File

@@ -237,7 +237,7 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
service.status.feedback = getDescriptionForStepAtIndex(service.status.steps, 0);
service.status.progress = 0;
function processInstallStep() {
function processInstallStep(retry) {
$http.post(Umbraco.Sys.ServerVariables.installApiBaseUrl + "PostPerformInstall", _installerModel)
.then(function (response) {
@@ -275,7 +275,9 @@ angular.module("umbraco.install").factory('installerService', function ($rootSco
// not as json. If this happens we can't actually load in external views since they will YSOD as well!
// so we need to display this in our own internal way
if (status >= 500 && status < 600) {
if(status === 502 && retry !== true){
processInstallStep(true);
}else if (status >= 500 && status < 600) {
service.status.current = { view: "ysod", model: null };
var ysod = data;
//we need to manually write the html to the iframe - the html contains full html markup