From a2357bad8536975b3034f60f71202f75cf50409b Mon Sep 17 00:00:00 2001 From: PerPloug Date: Tue, 11 Jan 2011 11:30:07 -0100 Subject: [PATCH 1/3] Reproduced #29779, Calling RefreshContent() after database upgrade fixes empty paths work items: 29779 --- .../presentation/install/steps/database.ascx | 1 + umbraco/presentation/install/utills/p.aspx.cs | 48 +++++++++++-------- 2 files changed, 28 insertions(+), 21 deletions(-) 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..531d21eaa1 100644 --- a/umbraco/presentation/install/utills/p.aspx.cs +++ b/umbraco/presentation/install/utills/p.aspx.cs @@ -79,34 +79,40 @@ 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(); - return "installed"; - } - else if (m_Installer.CurrentVersion == DatabaseVersion.None || m_Installer.CanUpgrade) - { - Helper.setProgress( 35, "Updating database tables...", ""); - m_Installer.Install(); + 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, "Upgrade completed!", ""); + Helper.setProgress(100, "Installation completed!", ""); - m_Installer = null; + m_Installer = null; - return "upgraded"; - } + return "installed"; + } else if (m_Installer.CurrentVersion == DatabaseVersion.None || m_Installer.CanUpgrade) { + Helper.setProgress(35, "Updating database tables...", ""); + m_Installer.Install(); + + Helper.setProgress(100, "Upgrade completed!", ""); + + m_Installer = null; + + library.RefreshContent(); + return "upgraded"; } + } + + + } return "no connection;"; From ff39e069dbaf4f276cd53f711bc1128010f59cc7 Mon Sep 17 00:00:00 2001 From: PerPloug Date: Tue, 11 Jan 2011 11:32:56 -0100 Subject: [PATCH 2/3] Reproduced #29779, Calling RefreshContent() after database upgrade fixes empty paths work items: 29779 --- umbraco/presentation/install/utills/p.aspx.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/umbraco/presentation/install/utills/p.aspx.cs b/umbraco/presentation/install/utills/p.aspx.cs index d778ff90d0..12a9dd3292 100644 --- a/umbraco/presentation/install/utills/p.aspx.cs +++ b/umbraco/presentation/install/utills/p.aspx.cs @@ -79,8 +79,14 @@ namespace umbraco.presentation.install.utills if (m_Installer.CanConnect) { - if (m_Installer.IsLatestVersion) + if (m_Installer.IsLatestVersion){ + + Helper.setProgress(90, "Refreshing content cache", ""); + + library.RefreshContent(); + Helper.setProgress( 100, "Database is up-to-date", ""); + } else { if (m_Installer.IsEmpty) @@ -93,6 +99,7 @@ namespace umbraco.presentation.install.utills m_Installer = null; + library.RefreshContent(); return "installed"; } else if (m_Installer.CurrentVersion == DatabaseVersion.None || m_Installer.CanUpgrade) @@ -104,6 +111,7 @@ namespace umbraco.presentation.install.utills m_Installer = null; + library.RefreshContent(); return "upgraded"; } } From 6f1776fb69e592e91d252f0a46d8dc45616c0e92 Mon Sep 17 00:00:00 2001 From: PerPloug Date: Tue, 11 Jan 2011 11:58:39 -0100 Subject: [PATCH 3/3] Work items: 29769 adds 40px to the member create dialog --- .../umbraco_client/Application/UmbracoApplicationActions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);