Fix Taxonomy Serialization (#15615)

--------- Co-authored-by: Sébastien Ros <[email protected]>
OrchardCMS · Mar 28, 2024 · 7aea7c4 · 7aea7c4
1 parent 7e9f3ac
commit 7aea7c4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Controllers/AdminController.cs
@@ -1,12 +1,10 @@
 using System.Linq;
-using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Settings;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Localization;
-using Microsoft.Extensions.Options;
 using OrchardCore.Admin;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Display;
@@ -321,7 +319,10 @@ public async Task<IActionResult> Delete(string taxonomyContentItemId, string tax
                 return NotFound();
             }
 
-            taxonomy.As<TaxonomyPart>().Content.Remove(taxonomyItemId);
+            taxonomy.Alter<TaxonomyPart>(part =>
+            {
+                part.Terms = part.Terms.Where(x => x.ContentItemId != taxonomyItemId).ToList();
+            });
 
             await _session.SaveAsync(taxonomy);
 

diff --git a/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemConverter.cs b/src/OrchardCore/OrchardCore.ContentManagement.Abstractions/ContentItemConverter.cs
@@ -91,10 +91,11 @@ public override ContentItem Read(ref Utf8JsonReader reader, Type typeToConvert,
                         contentItem.Owner = reader.TokenType == JsonTokenType.String ? reader.GetString() : null;
                         break;
                     default:
-                        if (reader.TokenType == JsonTokenType.StartObject)
+                        if (reader.TokenType == JsonTokenType.StartObject ||
+                            reader.TokenType == JsonTokenType.StartArray)
                         {
                             var property = JNode.Load(ref reader);
-                            contentItem.Data.Add(propertyName, property);
+                            contentItem.Data[propertyName] = property;
                         }
 
                         break;