diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx index d87cb3f12d..edcfef719e 100644 --- a/umbraco/presentation/install/steps/database.ascx +++ b/umbraco/presentation/install/steps/database.ascx @@ -247,6 +247,7 @@ }); + }); diff --git a/umbraco/presentation/install/steps/database.ascx.cs b/umbraco/presentation/install/steps/database.ascx.cs index 9da7c75062..22c2ca313d 100644 --- a/umbraco/presentation/install/steps/database.ascx.cs +++ b/umbraco/presentation/install/steps/database.ascx.cs @@ -46,7 +46,7 @@ namespace umbraco.presentation.install.steps /// protected bool IsEmbeddedDatabase { - get { return Request["database"] == "embedded"; } + get { return Request["database"] == "embedded" || GlobalSettings.DbDSN.ToLower().Contains("SQLCE4Umbraco.SqlCEHelper".ToLower()); } } protected bool IsConfigured @@ -133,7 +133,14 @@ namespace umbraco.presentation.install.steps toggleVisible(DatabaseUsernameItem, !ManualConnectionString && !IsEmbeddedDatabase); toggleVisible(DatabasePasswordItem, !ManualConnectionString && !IsEmbeddedDatabase); toggleVisible(DatabaseNameItem, !ManualConnectionString && !IsEmbeddedDatabase); - + + + if (IsEmbeddedDatabase) + dbinit.Text = "$('#databaseOptionEmbedded').click();$('#databaseOptionEmbedded').change();"; + else if(ManualConnectionString) + dbinit.Text = "$('#databaseOptionAdvanced').click();$('#databaseOptionAdvanced').change();"; + else if(DatabaseType.SelectedValue == "SqlServer") + dbinit.Text = "$('#databaseOptionBlank').click();$('#databaseOptionBlank').change();"; //toggleVisible(DatabaseConnectionString, ManualConnectionString); // Make sure ASP.Net displays the password text diff --git a/umbraco/presentation/install/steps/database.ascx.designer.cs b/umbraco/presentation/install/steps/database.ascx.designer.cs index ff51ca5e86..d54355b647 100644 --- a/umbraco/presentation/install/steps/database.ascx.designer.cs +++ b/umbraco/presentation/install/steps/database.ascx.designer.cs @@ -201,6 +201,15 @@ namespace umbraco.presentation.install.steps { /// protected global::System.Web.UI.WebControls.Literal jsVars; + /// + /// dbinit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Literal dbinit; + /// /// installing control. ///