Fixing new content item edition (#3337)

Fixes #3333
OrchardCMS · Mar 15, 2019 · 0e6f948 · 0e6f948
1 parent 023b3a9
commit 0e6f948
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentElement.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentElement.cs
@@ -10,7 +10,7 @@ namespace OrchardCore.ContentManagement
     /// </summary>
     public class ContentElement : IContent
     {
-        internal Dictionary<string, ContentElement> _elements = new Dictionary<string, ContentElement>();
+        private Dictionary<string, ContentElement> _elements;
 
         protected ContentElement() : this(new JObject())
         {
@@ -21,6 +21,9 @@ protected ContentElement(JObject data)
             Data = data;
         }
 
+        [JsonIgnore]
+        protected internal Dictionary<string, ContentElement> Elements => _elements = _elements ?? new Dictionary<string, ContentElement>();
+
         [JsonIgnore]
         public dynamic Content { get { return Data; } }
 

diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentExtensions.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentExtensions.cs
@@ -41,7 +41,7 @@ public static bool Has<TElement>(this ContentElement contentElement) where TElem
         /// <returns>The content element instance or <code>null</code> if it doesn't exist.</returns>
         public static ContentElement Get(this ContentElement contentElement, Type contentElementType, string name)
         {
-            if (contentElement._elements.TryGetValue(name, out var element))
+            if (contentElement.Elements.TryGetValue(name, out var element))
             {
                 return element;
             }
@@ -57,7 +57,7 @@ public static ContentElement Get(this ContentElement contentElement, Type conten
             result.Data = elementData;
             result.ContentItem = contentElement.ContentItem;
 
-            contentElement._elements[name] = result;
+            contentElement.Elements[name] = result;
 
             return result;
         }
@@ -77,7 +77,7 @@ public static ContentElement Get(this ContentElement contentElement, Type conten
                 var newElement = new TElement();
                 newElement.ContentItem = contentElement.ContentItem;
                 contentElement.Data[name] = newElement.Data;
-                contentElement._elements[name] = newElement;
+                contentElement.Elements[name] = newElement;
                 return newElement;
             }
 
@@ -92,14 +92,13 @@ public static ContentElement Get(this ContentElement contentElement, Type conten
         /// <returns>The current <see cref="ContentItem"/> instance.</returns>
         public static ContentElement Weld(this ContentElement contentElement, string name, ContentElement element)
         {
-            JToken result;
-            if (!contentElement.Data.TryGetValue(name, out result))
+            if (!contentElement.Data.ContainsKey(name))
             {
                 element.Data = JObject.FromObject(element, ContentBuilderSettings.IgnoreDefaultValuesSerializer);
                 element.ContentItem = contentElement.ContentItem;
 
                 contentElement.Data[name] = element.Data;
-                contentElement._elements[name] = element;
+                contentElement.Elements[name] = element;
             }
 
             return contentElement;

diff --git a/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs b/src/OrchardCore/OrchardCore.ContentManagement/DefaultContentManager.cs
@@ -315,8 +315,6 @@ public async Task UnpublishAsync(ContentItem contentItem)
 
         protected async Task<ContentItem> BuildNewVersionAsync(ContentItem existingContentItem)
         {
-            var buildingContentItem = await NewAsync(existingContentItem.ContentType);
-
             ContentItem latestVersion;
 
             if (existingContentItem.Latest)
@@ -342,6 +340,11 @@ protected async Task<ContentItem> BuildNewVersionAsync(ContentItem existingConte
                 latestVersion.Latest = false;
             }
 
+            // We are not invoking NewAsync as we are cloning an existing item
+            // This will also prevent the Elements (parts) from being allocated unnecessarily
+            var buildingContentItem = new ContentItem();
+
+            buildingContentItem.ContentType = existingContentItem.ContentType;
             buildingContentItem.ContentItemId = existingContentItem.ContentItemId;
             buildingContentItem.ContentItemVersionId = _idGenerator.GenerateUniqueId(existingContentItem);
             buildingContentItem.DisplayText = existingContentItem.DisplayText;