From fee23fac0a1e41d4ed6d4dff15861595678e7b28 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 17 Apr 2014 18:54:55 +1000 Subject: [PATCH] updates deep clone to have the false flag for resetting properties (we don't want to remember them when cloning) Conflicts: src/Umbraco.Core/Models/Member.cs --- src/Umbraco.Core/Models/Content.cs | 2 +- src/Umbraco.Core/Models/ContentTypeCompositionBase.cs | 2 +- src/Umbraco.Core/Models/EntityBase/Entity.cs | 2 +- src/Umbraco.Core/Models/File.cs | 2 +- src/Umbraco.Core/Models/Member.cs | 2 +- src/Umbraco.Core/Models/Property.cs | 2 +- src/Umbraco.Core/Models/PropertyType.cs | 2 +- src/Umbraco.Core/Models/Template.cs | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs index 5409d9e217..05b78fe5dc 100644 --- a/src/Umbraco.Core/Models/Content.cs +++ b/src/Umbraco.Core/Models/Content.cs @@ -442,7 +442,7 @@ namespace Umbraco.Core.Models //need to manually clone this since it's not settable clone._contentType = (IContentType)ContentType.DeepClone(); - clone.ResetDirtyProperties(true); + clone.ResetDirtyProperties(false); return clone; diff --git a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs index 7569d31d8e..c73ae8ee95 100644 --- a/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs +++ b/src/Umbraco.Core/Models/ContentTypeCompositionBase.cs @@ -225,7 +225,7 @@ namespace Umbraco.Core.Models //need to manually assign since this is an internal field and will not be automatically mapped clone.RemovedContentTypeKeyTracker = new List(); clone._contentTypeComposition = ContentTypeComposition.Select(x => (IContentTypeComposition)x.DeepClone()).ToList(); - clone.ResetDirtyProperties(true); + clone.ResetDirtyProperties(false); return clone; } diff --git a/src/Umbraco.Core/Models/EntityBase/Entity.cs b/src/Umbraco.Core/Models/EntityBase/Entity.cs index cc05d90214..b7d054c676 100644 --- a/src/Umbraco.Core/Models/EntityBase/Entity.cs +++ b/src/Umbraco.Core/Models/EntityBase/Entity.cs @@ -238,7 +238,7 @@ namespace Umbraco.Core.Models.EntityBase var clone = (Entity)MemberwiseClone(); //Automatically deep clone ref properties that are IDeepCloneable DeepCloneHelper.DeepCloneRefProperties(this, clone); - clone.ResetDirtyProperties(true); + clone.ResetDirtyProperties(false); return clone; //Using data contract serializer - has issues diff --git a/src/Umbraco.Core/Models/File.cs b/src/Umbraco.Core/Models/File.cs index 0bd80956dd..d337b82bbe 100644 --- a/src/Umbraco.Core/Models/File.cs +++ b/src/Umbraco.Core/Models/File.cs @@ -113,7 +113,7 @@ namespace Umbraco.Core.Models clone._alias = Alias; clone._name = Name; - clone.ResetDirtyProperties(true); + clone.ResetDirtyProperties(false); return clone; } diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs index 019b644afc..7ad25efb67 100644 --- a/src/Umbraco.Core/Models/Member.cs +++ b/src/Umbraco.Core/Models/Member.cs @@ -641,7 +641,7 @@ namespace Umbraco.Core.Models //need to manually clone this since it's not settable clone._contentType = (IMemberType)ContentType.DeepClone(); - clone.ResetDirtyProperties(true); + clone.ResetDirtyProperties(false); return clone; diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs index 165074dd99..99985ad39a 100644 --- a/src/Umbraco.Core/Models/Property.cs +++ b/src/Umbraco.Core/Models/Property.cs @@ -154,7 +154,7 @@ namespace Umbraco.Core.Models //need to manually assign since this is a readonly property clone._propertyType = (PropertyType)PropertyType.DeepClone(); - clone.ResetDirtyProperties(true); + clone.ResetDirtyProperties(false); return clone; } diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs index cdc1990766..5f583f3d8e 100644 --- a/src/Umbraco.Core/Models/PropertyType.cs +++ b/src/Umbraco.Core/Models/PropertyType.cs @@ -446,7 +446,7 @@ namespace Umbraco.Core.Models clone._propertyGroupId = new Lazy(() => propGroupId); } - clone.ResetDirtyProperties(true); + clone.ResetDirtyProperties(false); return clone; } diff --git a/src/Umbraco.Core/Models/Template.cs b/src/Umbraco.Core/Models/Template.cs index 2ea27939c5..2a2f59d132 100644 --- a/src/Umbraco.Core/Models/Template.cs +++ b/src/Umbraco.Core/Models/Template.cs @@ -205,7 +205,7 @@ namespace Umbraco.Core.Models clone._alias = Alias; clone._name = Name; - clone.ResetDirtyProperties(true); + clone.ResetDirtyProperties(false); return clone; }