From a04aef9b98260b16f96dbc755aadf552a15f4ae8 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 21 Nov 2013 10:17:52 +0100 Subject: [PATCH 1/5] U4-3623 Text corrections in install wizard --- src/Umbraco.Web.UI/install/steps/StarterKits.ascx | 3 +-- src/Umbraco.Web.UI/install/steps/theend.ascx | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.UI/install/steps/StarterKits.ascx b/src/Umbraco.Web.UI/install/steps/StarterKits.ascx index 5525ecddc2..a71ff25d9b 100644 --- a/src/Umbraco.Web.UI/install/steps/StarterKits.ascx +++ b/src/Umbraco.Web.UI/install/steps/StarterKits.ascx @@ -78,8 +78,7 @@

Starter kits

-

To help you get started here are some basic starter kits. They have been tailored to suit common site configurations and install useful functionality.
- Mouse over the icons to learn more about what the starter kits will install.

+

To help you get started here are some basic starter kits. They have been tailored to suit common site configurations and install useful functionality.

diff --git a/src/Umbraco.Web.UI/install/steps/theend.ascx b/src/Umbraco.Web.UI/install/steps/theend.ascx index 11404d8608..2f123741c6 100644 --- a/src/Umbraco.Web.UI/install/steps/theend.ascx +++ b/src/Umbraco.Web.UI/install/steps/theend.ascx @@ -24,13 +24,8 @@ jQuery(document).ready(function () {
-

- You’re done...now what?

-

- Excellent, you are now ready to start using Umbraco, one of the worlds most popular open - source .NET CMS. -
- If you installed a starter kit you can start by configuring your new site, just click "Preview your new website" and follow the instructions. Or to start adding content right away click "Set up your new website"

+

You’re done...now what?

+

Excellent, you are now ready to start using Umbraco, one of the worlds most popular open source .NET CMS.

From 31f67eac6cc4083a04104bb9971580f799401fcf Mon Sep 17 00:00:00 2001 From: Tim Geyssens Date: Thu, 21 Nov 2013 10:20:18 +0100 Subject: [PATCH 2/5] uses newtonsoft json serializer on rel link data upgrader --- .../Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs index 848d7099ab..4b3337f46e 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Web.Script.Serialization; using System.Xml; +using Newtonsoft.Json; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.Models.Rdbms; @@ -62,7 +63,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven } //store the serialized data - data.Text = new JavaScriptSerializer().Serialize(links); + data.Text = JsonConvert.SerializeObject(links); } } } From 16ea928c7558e80db0111523eb57c7e2f5acc58f Mon Sep 17 00:00:00 2001 From: Tim Geyssens Date: Thu, 21 Nov 2013 10:30:27 +0100 Subject: [PATCH 3/5] rel links data upgrader, migration is working :) --- .../Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs index 4b3337f46e..4e5b4f1089 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs @@ -64,6 +64,8 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven //store the serialized data data.Text = JsonConvert.SerializeObject(links); + + database.Update(data); } } } From 92c28de0284404cb6c69054b3d840fe23a7888e7 Mon Sep 17 00:00:00 2001 From: Tim Geyssens Date: Thu, 21 Nov 2013 10:41:42 +0100 Subject: [PATCH 4/5] Final touches to rel links data upgrader --- .../TargetVersionSeven/UpdateRelatedLinksData.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs index 4e5b4f1089..d0c5ab32f9 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs @@ -34,6 +34,8 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven { if (!string.IsNullOrEmpty(data.Text)) { + var cs = ApplicationContext.Current.Services.ContentService; + //fetch the current data (that's in xml format) var xml = new XmlDocument(); xml.LoadXml(data.Text); @@ -59,6 +61,20 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven link.Add("edit", false); link.Add("isInternal", type.Equals("internal")); + try + { + if (type.Equals("internal")) + { + int nodeId; + if (int.TryParse(lnk, out nodeId)) + link.Add("internalName", cs.GetById(nodeId).Name); + } + } + catch (Exception ex) + { + LogHelper.Error("Exception was thrown when trying to update related links property data, fetching internal node id", ex); + } + links.Add((ExpandoObject) link); } From 1c20496974cb2438db5453c87428020c41690357 Mon Sep 17 00:00:00 2001 From: Tim Geyssens Date: Thu, 21 Nov 2013 11:13:21 +0100 Subject: [PATCH 5/5] removes cs from rel links data upgrader, was getting lock issues --- .../UpdateRelatedLinksData.cs | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs index d0c5ab32f9..a3ad8f47eb 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs @@ -34,7 +34,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven { if (!string.IsNullOrEmpty(data.Text)) { - var cs = ApplicationContext.Current.Services.ContentService; + //var cs = ApplicationContext.Current.Services.ContentService; //fetch the current data (that's in xml format) var xml = new XmlDocument(); @@ -61,19 +61,19 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven link.Add("edit", false); link.Add("isInternal", type.Equals("internal")); - try - { - if (type.Equals("internal")) - { - int nodeId; - if (int.TryParse(lnk, out nodeId)) - link.Add("internalName", cs.GetById(nodeId).Name); - } - } - catch (Exception ex) - { - LogHelper.Error("Exception was thrown when trying to update related links property data, fetching internal node id", ex); - } + //try + //{ + // if (type.Equals("internal")) + // { + // int nodeId; + // if (int.TryParse(lnk, out nodeId)) + // link.Add("internalName", cs.GetById(nodeId).Name); + // } + //} + //catch (Exception ex) + //{ + // LogHelper.Error("Exception was thrown when trying to update related links property data, fetching internal node id", ex); + //} links.Add((ExpandoObject) link); }