yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates deep clone to have the false flag for resetting properties (we don't want to remember them when cloning)

Browse Source 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
This commit is contained in:
Shannon
2014-04-17 18:54:55 +10:00
parent cf6775ec31
commit fee23fac0a
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/Content.cs
View File

@@ -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;

2
src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
View File

@@ -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<int>();
clone._contentTypeComposition = ContentTypeComposition.Select(x => (IContentTypeComposition)x.DeepClone()).ToList();
clone.ResetDirtyProperties(true);
clone.ResetDirtyProperties(false);
return clone;
}

2
src/Umbraco.Core/Models/EntityBase/Entity.cs
View File

@@ -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

2
src/Umbraco.Core/Models/File.cs
View File

@@ -113,7 +113,7 @@ namespace Umbraco.Core.Models
clone._alias = Alias;
clone._name = Name;
clone.ResetDirtyProperties(true);
clone.ResetDirtyProperties(false);
return clone;
}

2
src/Umbraco.Core/Models/Member.cs
View File

@@ -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;

2
src/Umbraco.Core/Models/Property.cs
View File

@@ -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;
}

2
src/Umbraco.Core/Models/PropertyType.cs
View File

@@ -446,7 +446,7 @@ namespace Umbraco.Core.Models
clone._propertyGroupId = new Lazy<int>(() => propGroupId);
}
clone.ResetDirtyProperties(true);
clone.ResetDirtyProperties(false);
return clone;
}

2
src/Umbraco.Core/Models/Template.cs
View File

@@ -205,7 +205,7 @@ namespace Umbraco.Core.Models
clone._alias = Alias;
clone._name = Name;
clone.ResetDirtyProperties(true);
clone.ResetDirtyProperties(false);
return clone;
}