diff --git a/umbraco/presentation/install/steps/database.ascx b/umbraco/presentation/install/steps/database.ascx index 5cf09f89fc..1d76b90eaa 100644 --- a/umbraco/presentation/install/steps/database.ascx +++ b/umbraco/presentation/install/steps/database.ascx @@ -139,6 +139,7 @@ }); +
diff --git a/umbraco/presentation/install/utills/p.aspx.cs b/umbraco/presentation/install/utills/p.aspx.cs index d778ff90d0..2962d701dc 100644 --- a/umbraco/presentation/install/utills/p.aspx.cs +++ b/umbraco/presentation/install/utills/p.aspx.cs @@ -79,20 +79,31 @@ namespace umbraco.presentation.install.utills if (m_Installer.CanConnect) { - if (m_Installer.IsLatestVersion) - Helper.setProgress( 100, "Database is up-to-date", ""); - else - { - if (m_Installer.IsEmpty) - { - Helper.setProgress( 35, "Installing tables...", ""); - //do install - m_Installer.Install(); + if (m_Installer.IsLatestVersion) { - Helper.setProgress( 100, "Installation completed!", ""); + Helper.setProgress(90, "Refreshing content cache", ""); - m_Installer = null; + library.RefreshContent(); + Helper.setProgress(100, "Database is up-to-date", ""); + + } else { + if (m_Installer.IsEmpty) { + Helper.setProgress(35, "Installing tables...", ""); + //do install + m_Installer.Install(); + + Helper.setProgress(100, "Installation completed!", ""); + + m_Installer = null; + + library.RefreshContent(); + return "installed"; + } else if (m_Installer.CurrentVersion == DatabaseVersion.None || m_Installer.CanUpgrade) { + Helper.setProgress(35, "Updating database tables...", ""); + m_Installer.Install(); + + library.RefreshContent(); return "installed"; } else if (m_Installer.CurrentVersion == DatabaseVersion.None || m_Installer.CanUpgrade) @@ -100,13 +111,17 @@ namespace umbraco.presentation.install.utills Helper.setProgress( 35, "Updating database tables...", ""); m_Installer.Install(); - Helper.setProgress( 100, "Upgrade completed!", ""); + Helper.setProgress(100, "Upgrade completed!", ""); - m_Installer = null; + m_Installer = null; - return "upgraded"; - } + library.RefreshContent(); + return "upgraded"; } + } + + + } return "no connection;"; diff --git a/umbraco/presentation/umbraco_client/Application/UmbracoApplicationActions.js b/umbraco/presentation/umbraco_client/Application/UmbracoApplicationActions.js index 359e773e0c..3e578f7d8d 100644 --- a/umbraco/presentation/umbraco_client/Application/UmbracoApplicationActions.js +++ b/umbraco/presentation/umbraco_client/Application/UmbracoApplicationActions.js @@ -259,7 +259,7 @@ Umbraco.Application.Actions = function () { UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 600, 425); } else if (actionNode.nodeType == "initmember") { - UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 380); + UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 480, 380); } else if (actionNode.nodeType == "initpython" || actionNode.nodeType == "initdlrscripting") { UmbClientMgr.openModalWindow("create.aspx?nodeId=" + actionNode.nodeId + "&nodeType=" + actionNode.nodeType + "&nodeName=" + actionNode.nodeName + '&rnd=' + this._utils.generateRandom(), uiKeys['actions_create'], true, 420, 380);