Merge pull request #49 from ngibbonssdl/hotfix/expandEmbeddedModels

Fully expand entity models in RTF fields
RWS · Sep 28, 2022 · 0f9cfa3 · 0f9cfa3
2 parents 68ddad4 + a251009
commit 0f9cfa3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Sdl.Web.Tridion.Templates.R2/Data/DataModelBuilder.cs b/Sdl.Web.Tridion.Templates.R2/Data/DataModelBuilder.cs
@@ -217,7 +217,7 @@ private object GetFieldValue(XmlElement xmlElement, int expandLinkDepth)
             if (xmlElement.SelectSingleElement("xhtml:*") != null)
             {
                 // XHTML field
-                return BuildRichTextModel(xmlElement);
+                return BuildRichTextModel(xmlElement, expandLinkDepth);
             }
 
             if (xmlElement.SelectSingleElement("*") != null)
@@ -292,7 +292,7 @@ private ViewModelData GetLinkFieldValue(IdentifiableObject linkedItem, int expan
             return Pipeline.CreateKeywordModel(linkedKeyword, expandLinkDepth - 1);
         }
 
-        protected RichTextData BuildRichTextModel(XmlElement xhtmlElement)
+        protected RichTextData BuildRichTextModel(XmlElement xhtmlElement, int expandLinkDepth = 0)
         {
             XmlDocument xmlDoc = xhtmlElement.OwnerDocument;
             IList<EntityModelData> embeddedEntities = new List<EntityModelData>();
@@ -301,7 +301,7 @@ protected RichTextData BuildRichTextModel(XmlElement xhtmlElement)
                 Component linkedComponent = Pipeline.Session.GetObject(xlinkElement) as Component;
                 if (xlinkElement.LocalName == "img" || ShouldBeEmbedded(linkedComponent))
                 {
-                    EntityModelData embeddedEntity = Pipeline.CreateEntityModel(linkedComponent, ct: null, expandLinkDepth: 0);
+                    EntityModelData embeddedEntity = Pipeline.CreateEntityModel(linkedComponent, ct: null, expandLinkDepth: expandLinkDepth);
 
                     // Map each attribute to a metadata field