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

U4-2117 - fix Ancestor- vs AncestorsOrSelf inconsistencies

Browse Source
This commit is contained in:
Stephan
2013-04-16 12:29:58 -02:00
parent b32ea68fd0
commit 3882e1984d
2 changed files with 144 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
src/Umbraco.Web/PublishedContentExtensions.cs
View File

@@ -784,128 +784,100 @@ namespace Umbraco.Web
#endregion
#region Ancestors
#region Ancestors
public static IEnumerable<IPublishedContent> Ancestors(this IPublishedContent content, int level)
{
return content.Ancestors(n => n.Level <= level);
}
public static IEnumerable<IPublishedContent> Ancestors(this IPublishedContent content, string nodeTypeAlias)
{
return content.Ancestors(n => n.DocumentTypeAlias == nodeTypeAlias);
}
public static IEnumerable<IPublishedContent> Ancestors(this IPublishedContent content)
{
return content.Ancestors(n => true);
}
internal static IEnumerable<IPublishedContent> Ancestors(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
var ancestorList = new List<IPublishedContent>();
var node = content;
while (node != null)
{
if (node.Level == 1) break;
var parent = node.Parent;
if (parent == null)
{
break;
}
if (content != parent)
{
node = parent;
if (func(node))
{
ancestorList.Add(node);
}
}
else
{
break;
}
}
ancestorList.Reverse();
return ancestorList;
}
public static IEnumerable<IPublishedContent> Ancestors(this IPublishedContent content)
{
return content.AncestorsOrSelf(false, n => true);
}
public static IPublishedContent AncestorOrSelf(this IPublishedContent content)
{
//TODO: Why is this query like this??
return content.AncestorOrSelf(node => node.Level == 1);
}
public static IPublishedContent AncestorOrSelf(this IPublishedContent content, int level)
{
return content.AncestorOrSelf(node => node.Level == level);
}
public static IPublishedContent AncestorOrSelf(this IPublishedContent content, string nodeTypeAlias)
{
return content.AncestorOrSelf(node => node.DocumentTypeAlias == nodeTypeAlias);
}
internal static IPublishedContent AncestorOrSelf(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
var node = content;
while (node != null)
{
if (func(node)) return node;
var parent = node.Parent;
if (parent == null)
{
return null;
}
if (content != parent)
{
node = parent;
}
else
{
return node;
}
}
return null;
}
public static IEnumerable<IPublishedContent> Ancestors(this IPublishedContent content, int level)
{
return content.AncestorsOrSelf(false, n => n.Level <= level);
}
internal static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
var ancestorList = new List<IPublishedContent>();
var node = content;
ancestorList.Add(node);
while (node != null)
{
if (node.Level == 1) break;
var parent = node.Parent;
if (parent == null)
{
break;
}
if (content != parent)
{
node = parent;
if (func(node))
{
ancestorList.Add(node);
}
}
else
{
break;
}
}
ancestorList.Reverse();
return ancestorList;
}
public static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content)
{
return content.AncestorsOrSelf(n => true);
}
public static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, string nodeTypeAlias)
{
return content.AncestorsOrSelf(n => n.DocumentTypeAlias == nodeTypeAlias);
}
public static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, int level)
{
return content.AncestorsOrSelf(n => n.Level <= level);
}
public static IEnumerable<IPublishedContent> Ancestors(this IPublishedContent content, string nodeTypeAlias)
{
return content.AncestorsOrSelf(false, n => n.DocumentTypeAlias == nodeTypeAlias);
}
#endregion
public static IEnumerable<IPublishedContent> Ancestors(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
return content.AncestorsOrSelf(false, func);
}
public static IPublishedContent AncestorOrSelf(this IPublishedContent content)
{
//TODO: Why is this query like this??
return content.AncestorOrSelf(node => node.Level == 1);
}
public static IPublishedContent AncestorOrSelf(this IPublishedContent content, int level)
{
return content.AncestorOrSelf(node => node.Level == level);
}
public static IPublishedContent AncestorOrSelf(this IPublishedContent content, string nodeTypeAlias)
{
return content.AncestorOrSelf(node => node.DocumentTypeAlias == nodeTypeAlias);
}
internal static IPublishedContent AncestorOrSelf(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
if (func(content))
return content;
while (content.Level > 1) // while we have a parent, consider the parent
{
content = content.Parent;
if (func(content))
return content;
}
return null;
}
public static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content)
{
return content.AncestorsOrSelf(true, n => true);
}
public static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, int level)
{
return content.AncestorsOrSelf(true, n => n.Level <= level);
}
public static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, string nodeTypeAlias)
{
return content.AncestorsOrSelf(true, n => n.DocumentTypeAlias == nodeTypeAlias);
}
internal static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
return content.AncestorsOrSelf(true, func);
}
internal static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, bool orSelf, Func<IPublishedContent, bool> func)
{
var ancestors = new List<IPublishedContent>();
if (orSelf && func(content))
ancestors.Add(content);
while (content.Level > 1) // while we have a parent, consider the parent
{
content = content.Parent;
if (func(content))
ancestors.Add(content);
}
ancestors.Reverse();
return ancestors;
}
#endregion
#region Descendants
public static IEnumerable<IPublishedContent> Descendants(this IPublishedContent content, string nodeTypeAlias)

117
src/umbraco.MacroEngines/RazorDynamicNode/DynamicNode.cs
View File

@@ -954,73 +954,61 @@ namespace umbraco.MacroEngines
}
public DynamicNode AncestorOrSelf(Func<DynamicNode, bool> func)
{
var node = this;
while (node != null)
if (func(this)) return this;
var content = this;
while (content.Level > 1) // while we have a parent, consider the parent
{
if (func(node)) return node;
DynamicNode parent = node.Parent;
if (parent != null)
{
if (this != parent)
{
node = parent;
}
else
{
return node;
}
}
else
{
return null;
}
// see note in .Parent - strange things can happen
var parent = content.Parent;
if (parent == content) return null;
content = parent;
if (func(content))
return content;
}
return node;
}
public DynamicNodeList AncestorsOrSelf(Func<DynamicNode, bool> func)
{
List<DynamicNode> ancestorList = new List<DynamicNode>();
var node = this;
ancestorList.Add(node);
while (node != null)
{
if (node.Level == 1) break;
DynamicNode parent = node.Parent;
if (parent != null)
{
if (this != parent)
{
node = parent;
if (func(node))
{
ancestorList.Add(node);
}
}
else
{
break;
}
}
else
{
break;
}
}
ancestorList.Reverse();
return new DynamicNodeList(ancestorList);
return null;
}
public DynamicNodeList AncestorsOrSelf()
{
return AncestorsOrSelf(n => true);
}
public DynamicNodeList AncestorsOrSelf(string nodeTypeAlias)
{
return AncestorsOrSelf(n => n.NodeTypeAlias == nodeTypeAlias);
}
public DynamicNodeList AncestorsOrSelf(int level)
{
return AncestorsOrSelf(n => n.Level <= level);
}
public DynamicNodeList AncestorsOrSelf(string nodeTypeAlias)
{
return AncestorsOrSelf(n => n.NodeTypeAlias == nodeTypeAlias);
}
public DynamicNodeList AncestorsOrSelf(Func<DynamicNode, bool> func)
{
var ancestors = new List<DynamicNode>();
if (func(this))
ancestors.Add(this);
var content = this;
while (content.Level > 1) // while we have a parent, consider the parent
{
// see note in .Parent - strange things can happen
var parent = content.Parent;
if (parent == content) break;
content = parent;
if (func(content))
ancestors.Add(content);
}
ancestors.Reverse();
return new DynamicNodeList(ancestors);
}
public DynamicNodeList Descendants(string nodeTypeAlias)
{
return Descendants(p => p.NodeTypeAlias == nodeTypeAlias);
@@ -1109,22 +1097,25 @@ namespace umbraco.MacroEngines
ancestorList.Reverse();
return new DynamicNodeList(ancestorList);
}
public DynamicNode Parent
{
get
{
if (n == null)
{
return null;
}
if (n.Parent != null)
{
return new DynamicNode(n.Parent);
}
// DynamicBackingItem.Id will return zero if IsNull else it should return non-zero;
// it's IsNull when it's neither content nor media - which might happen when created
// an invalid identifier. And then it's a "non-existing" node which is its own parent.
// Does not make much sense, but, hey...
if (n != null && n.Id == 0)
{
return this;
}
return this; // ouch
return null;
}
}