lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#191 Fixed handling of added nodes in diffgram analysis.

Browse Source
This commit is contained in:
Daniel Stolt
2014-07-19 23:32:51 +02:00
parent 359c765109
commit a39d1eb492
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/DiffGramAnalyzer.cs
View File

@@ -61,6 +61,7 @@ namespace Orchard.AuditTrail.Providers.Content {
};
}
else {
var elementName = currentElement.Name.ToString();
var originalContent = currentElement.Value;
var currentContent = reader.ReadElementContentAsString();
@@ -69,16 +70,26 @@ namespace Orchard.AuditTrail.Providers.Content {
yield return
new DiffNode {
Type = DiffType.Change,
Context = currentElement.Name.ToString(),
Context = BuildContextName(stack, elementName),
Previous = originalContent,
Current = currentContent
};
}
break;
case "add":
string nodeName = reader.GetAttribute("name");
string addedContent = null;
reader.Read();
var addedElementContent = reader.ReadElementContentAsString();
yield return new DiffNode { Type = DiffType.Addition, Context = reader.Name, Current = addedElementContent };
if (reader.NodeType != XmlNodeType.EndElement) {
nodeName = reader.Name;
addedContent = reader.ReadElementContentAsString();
}
yield return
new DiffNode {
Type = DiffType.Addition,
Context = BuildContextName(stack, nodeName),
Current = addedContent
};
break;
}
}
@@ -93,8 +104,8 @@ namespace Orchard.AuditTrail.Providers.Content {
}
}
private string BuildContextName(IEnumerable<XElement> stack, string attributeName) {
return String.Join("/", stack.Reverse().Skip(1).Select(x => x.Name)) + "/" + attributeName;
private string BuildContextName(IEnumerable<XElement> stack, string nodeName) {
return String.Format("{0}/{1}", String.Join("/", stack.Reverse().Skip(1).Select(x => x.Name)), nodeName);
}
}
}