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

Fixing U4-359 Previewing new nested pages doesn't work

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-01-30 09:21:43 -01:00
parent 0cb9cc6840
commit cc5ca0b5fe
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
View File

@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Configuration;
using System.Globalization;
using System.Linq;
using System.Web;
using System.Web.Security;
@@ -52,13 +54,30 @@ namespace umbraco.presentation.preview
// clone xml
XmlContent = (XmlDocument)content.Instance.XmlContent.Clone();
// inject current document xml
int parentId = documentObject.Level == 1 ? -1 : documentObject.Parent.Id;
XmlContent = content.AppendDocumentXml(documentObject.Id, documentObject.Level, parentId, documentObject.ToPreviewXml(XmlContent), XmlContent);
var previewNodes = new List<Document>();
var parentId = documentObject.Level == 1 ? -1 : documentObject.Parent.Id;
while (parentId > 0 && XmlContent.GetElementById(parentId.ToString(CultureInfo.InvariantCulture)) == null)
{
var document = new Document(parentId);
previewNodes.Insert(0, document);
parentId = document.ParentId;
}
previewNodes.Add(documentObject);
foreach (var document in previewNodes)
{
//Inject preview xml
parentId = document.Level == 1 ? -1 : document.Parent.Id;
var previewXml = document.ToPreviewXml(XmlContent);
content.AppendDocumentXml(document.Id, document.Level, parentId, previewXml, XmlContent);
}
if (includeSubs)
{
foreach (CMSPreviewNode prevNode in documentObject.GetNodesForPreview(true))
foreach (var prevNode in documentObject.GetNodesForPreview(true))
{
XmlContent = content.AppendDocumentXml(prevNode.NodeId, prevNode.Level, prevNode.ParentId, XmlContent.ReadNode(XmlReader.Create(new StringReader(prevNode.Xml))), XmlContent);
}