WIP installer db step update
This commit is contained in:
@@ -247,6 +247,7 @@
|
||||
|
||||
});
|
||||
|
||||
<asp:Literal id="dbinit" runat="server"></asp:Literal>
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -46,7 +46,7 @@ namespace umbraco.presentation.install.steps
|
||||
/// </summary>
|
||||
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
|
||||
|
||||
@@ -201,6 +201,15 @@ namespace umbraco.presentation.install.steps {
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal jsVars;
|
||||
|
||||
/// <summary>
|
||||
/// dbinit control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Literal dbinit;
|
||||
|
||||
/// <summary>
|
||||
/// installing control.
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user