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

AB#6233 - Clean up

Browse Source
This commit is contained in:
Bjarke Berg
2020-05-07 10:21:32 +02:00
parent e3f9b94fd0
commit e121ce136f
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Umbraco.Web.Common/Install/InstallApiController.cs
View File

@@ -1,17 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
using Umbraco.Core;
using Umbraco.Core.Exceptions;
using Umbraco.Core.Logging;
using Umbraco.Core.Migrations.Install;
using Umbraco.Net;
using Umbraco.Web.Common.Attributes;
using Umbraco.Web.Common.Exceptions;
using Umbraco.Web.Install;
using Umbraco.Web.Install.Models;
@@ -152,32 +151,20 @@ namespace Umbraco.Web.Common.Install
var installException = ex as InstallException;
if (installException != null)
{
throw new HttpResponseException(HttpStatusCode.BadRequest, new
throw HttpResponseException.CreateValidationErrorResponse(new
{
view = installException.View,
model = installException.ViewModel,
message = installException.Message
})
{
AdditionalHeaders =
{
["X-Status-Reason"] = "Validation failed"
}
};
});
}
throw new HttpResponseException(HttpStatusCode.BadRequest,new
throw HttpResponseException.CreateValidationErrorResponse(new
{
step = step.Name,
view = "error",
message = ex.Message
})
{
AdditionalHeaders =
{
["X-Status-Reason"] = "Validation failed"
}
};
});
}
}