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

Changed @Model.CurrentContent to @Model.Content, updated some ext methods for IPublishedContent.

Browse Source
This commit is contained in:
Shannon Deminick
2012-10-08 21:55:03 +05:00
parent 8ae867389d
commit 82bb410f4f
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -408,7 +408,7 @@ namespace Umbraco.Web
{
return content.Ancestors(n => true);
}
public static IEnumerable<IPublishedContent> Ancestors(this IPublishedContent content, Func<IPublishedContent, bool> func)
private static IEnumerable<IPublishedContent> Ancestors(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
var ancestorList = new List<IPublishedContent>();
var node = content;
@@ -450,7 +450,7 @@ namespace Umbraco.Web
{
return content.AncestorOrSelf(node => node.DocumentTypeAlias == nodeTypeAlias);
}
public static IPublishedContent AncestorOrSelf(this IPublishedContent content, Func<IPublishedContent, bool> func)
private static IPublishedContent AncestorOrSelf(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
var node = content;
while (node != null)
@@ -473,7 +473,7 @@ namespace Umbraco.Web
return null;
}
public static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, Func<IPublishedContent, bool> func)
internal static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
var ancestorList = new List<IPublishedContent>();
var node = content;
@@ -510,7 +510,7 @@ namespace Umbraco.Web
{
return content.AncestorsOrSelf(n => n.DocumentTypeAlias == nodeTypeAlias);
}
public static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, int level)
private static IEnumerable<IPublishedContent> AncestorsOrSelf(this IPublishedContent content, int level)
{
return content.AncestorsOrSelf(n => n.Level <= level);
}
@@ -530,7 +530,7 @@ namespace Umbraco.Web
{
return content.Descendants(n => true);
}
internal static IEnumerable<IPublishedContent> Descendants(this IPublishedContent content, Func<IPublishedContent, bool> func)
private static IEnumerable<IPublishedContent> Descendants(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
return content.Children.Map(func, (IPublishedContent n) => n.Children);
}
@@ -546,7 +546,7 @@ namespace Umbraco.Web
{
return content.DescendantsOrSelf(p => true);
}
internal static IEnumerable<IPublishedContent> DescendantsOrSelf(this IPublishedContent content, Func<IPublishedContent, bool> func)
private static IEnumerable<IPublishedContent> DescendantsOrSelf(this IPublishedContent content, Func<IPublishedContent, bool> func)
{
if (content != null)
{
@@ -739,6 +739,19 @@ namespace Umbraco.Web
}
#endregion
/// <summary>
/// Method to return the Children of the content item
/// </summary>
/// <param name="p"></param>
/// <returns></returns>
/// <remarks>
/// This method exists for consistency, it is the same as calling content.Children as a property.
/// </remarks>
public static IEnumerable<IPublishedContent> Children(this IPublishedContent p)
{
return p.Children;
}
/// <summary>
/// Returns a DataTable object for the IPublishedContent
/// </summary>