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

Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer

Browse Source 
Conflicts:
	src/Umbraco.Web.UI.Client/src/installer/installer.service.js
	src/Umbraco.Web/Install/Controllers/InstallApiController.cs
This commit is contained in:
Shannon
2014-03-05 10:34:27 +11:00
parent 24ceb5ce2d 923eb300e5
commit 8e89aa233c
14 changed files with 289 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/Install/Controllers/InstallApiController.cs
View File

@@ -256,11 +256,13 @@ namespace Umbraco.Web.Install.Controllers
ex = ex.InnerException;
}
//return custom view if we have an install exception
var installException = ex as InstallException;
if (installException != null)
{
throw new HttpResponseException(Request.CreateValidationErrorResponse(new
{
step = step.Name,
view = installException.View,
model = installException.ViewModel,
message = installException.Message
@@ -269,6 +271,15 @@ namespace Umbraco.Web.Install.Controllers
throw new HttpResponseException(
Request.CreateValidationErrorResponse("An error occurred executing the step: " + step.Name + ". Error: " + ex.Message));
//return standard view + step and message to display generic message
return Json(new
{
step = step.Name,
view = "error",
message = ex.Message
}, HttpStatusCode.BadRequest);
//return Request.CreateValidationErrorResponse("An error occurred executing the step: " + step.Name + ". Error: " + ex.Message);
}
}
}