From 51309e62ec67b50eb9733893e1949a430aa6e78e Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 17 Apr 2014 19:55:17 +1000 Subject: [PATCH] Fixes: U4-4714 Sql Azure no longer a database option in 7.1 --- .../src/installer/steps/database.controller.js | 3 ++- src/Umbraco.Web/Install/Controllers/InstallApiController.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js index 5ac118e1f4..5b3e174930 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js @@ -4,7 +4,8 @@ angular.module("umbraco.install").controller("Umbraco.Installer.DataBaseControll $scope.dbs = [ {name: 'Microsoft SQL Server Compact (SQL CE)', id: 0}, {name: 'Microsoft SQL Server', id: 1}, - {name: 'MySQL', id: 2}, + { name: 'Microsoft SQL Azure', id: 3 }, + { name: 'MySQL', id: 2 }, {name: 'Custom connection string', id: -1}]; if(installerService.status.current.model.dbType === undefined){ diff --git a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs index 1d88b9b9a2..6041e23ca5 100644 --- a/src/Umbraco.Web/Install/Controllers/InstallApiController.cs +++ b/src/Umbraco.Web/Install/Controllers/InstallApiController.cs @@ -55,7 +55,8 @@ namespace Umbraco.Web.Install.Controllers public bool PostValidateDatabaseConnection(DatabaseModel model) { var dbHelper = new DatabaseHelper(); - return dbHelper.CheckConnection(model, ApplicationContext); + var canConnect = dbHelper.CheckConnection(model, ApplicationContext); + return canConnect; } ///