diff --git a/components/editorControls/XPathCheckBoxList/XPathCheckBoxListPreValueEditor.cs b/components/editorControls/XPathCheckBoxList/XPathCheckBoxListPreValueEditor.cs index cd07ceeae3..bd1c4c51cd 100644 --- a/components/editorControls/XPathCheckBoxList/XPathCheckBoxListPreValueEditor.cs +++ b/components/editorControls/XPathCheckBoxList/XPathCheckBoxListPreValueEditor.cs @@ -3,6 +3,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.Xml.XPath; using umbraco.cms.businesslogic.datatype; +using System.Linq; namespace umbraco.editorControls.XPathCheckBoxList { @@ -139,7 +140,7 @@ namespace umbraco.editorControls.XPathCheckBoxList try { - if (uQuery.GetNodesByXPath(xPath).Count >= 0) + if (uQuery.GetNodesByXPath(xPath).Count() >= 0) { isValid = true; } diff --git a/components/editorControls/XPathDropDownList/XPathDropDownListPreValueEditor.cs b/components/editorControls/XPathDropDownList/XPathDropDownListPreValueEditor.cs index cb67106f07..66adf19e3d 100644 --- a/components/editorControls/XPathDropDownList/XPathDropDownListPreValueEditor.cs +++ b/components/editorControls/XPathDropDownList/XPathDropDownListPreValueEditor.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using System.Web.UI; using System.Web.UI.WebControls; using System.Xml.XPath; @@ -119,7 +120,7 @@ namespace umbraco.editorControls.XPathDropDownList try { - if (uQuery.GetNodesByXPath(xPath).Count >= 0) + if (uQuery.GetNodesByXPath(xPath).Count() >= 0) { isValid = true; } diff --git a/umbraco/presentation/umbraco/Trees/RelationTypes/RegisterRelationTypeTree.cs b/umbraco/presentation/umbraco/Trees/RelationTypes/RegisterRelationTypeTree.cs index bdd0355ad5..f196346f54 100644 --- a/umbraco/presentation/umbraco/Trees/RelationTypes/RegisterRelationTypeTree.cs +++ b/umbraco/presentation/umbraco/Trees/RelationTypes/RegisterRelationTypeTree.cs @@ -18,7 +18,7 @@ namespace umbraco.cms.presentation.Trees.RelationTypes { Application developerSection = Application.getByAlias("developer"); - ApplicationTree relationTypesApplicationTree = new ApplicationTree(false, true, 1, "developer", "relationTypesTree", "Relation Types", ".sprTreeFolder", ".sprTreeFolder_0", "Umbraco.RelationTypes", "RelationTypeTree", null); + ApplicationTree relationTypesApplicationTree = new ApplicationTree(false, true, 3, "developer", "relationTypesTree", "Relation Types", ".sprTreeFolder", ".sprTreeFolder_0", "umbraco", "cms.presentation.Trees.RelationTypes.RelationTypeTree", null); TreeDefinition relationTypesTreeDefinition = new TreeDefinition(typeof(umbraco.cms.presentation.Trees.RelationTypes.RelationTypeTree), relationTypesApplicationTree, developerSection); diff --git a/umbraco/presentation/umbraco/uQuery/MediaExtensions.cs b/umbraco/presentation/umbraco/uQuery/MediaExtensions.cs index 7bddbf5662..74d7103396 100644 --- a/umbraco/presentation/umbraco/uQuery/MediaExtensions.cs +++ b/umbraco/presentation/umbraco/uQuery/MediaExtensions.cs @@ -125,16 +125,16 @@ namespace umbraco } } - /// - /// Extension method on Meia obj to get it's depth - /// - /// an umbraco.cms.businesslogic.media.Media object - /// an int representing the depth of the Media object in the tree - [Obsolete("Use .Level instead")] - public static int GetDepth(this Media media) - { - return media.Path.Split(',').ToList().Count; - } + /////// + /////// Extension method on Meia obj to get it's depth + /////// + /////// an umbraco.cms.businesslogic.media.Media object + /////// an int representing the depth of the Media object in the tree + ////[Obsolete("Use .Level instead")] + ////public static int GetDepth(this Media media) + ////{ + //// return media.Path.Split(',').ToList().Count; + ////} /// /// Tell me the level of this node (0 = root) diff --git a/umbraco/presentation/umbraco/uQuery/NodeExtensions.cs b/umbraco/presentation/umbraco/uQuery/NodeExtensions.cs index 70cca1338c..85232ee16f 100644 --- a/umbraco/presentation/umbraco/uQuery/NodeExtensions.cs +++ b/umbraco/presentation/umbraco/uQuery/NodeExtensions.cs @@ -576,18 +576,6 @@ namespace umbraco return node.NiceUrl.Replace(library.RequestServerVariables("HTTP_HOST"), string.Concat((ssl ? "https://" : "http://"), domain.Name)); } - /// - /// Determines whether [the specified node] [is hidden from navigation]. - /// - /// The node. - /// - /// true if [the specified node] [is hidden from navigation]; otherwise, false. - /// - public static bool IsHiddenFromNavigation(this Node node) - { - // TODO: [OA] Document on Codeplex. Is this one really necessary? - [HR] this one could be confusing as depends on default naming convention - return node.GetProperty("umbracoNaviHide"); - } #pragma warning disable 0618 /// diff --git a/umbraco/presentation/umbraco/uQuery/uQuery-Document.cs b/umbraco/presentation/umbraco/uQuery/uQuery-Document.cs index 608fbd142e..894acebc79 100644 --- a/umbraco/presentation/umbraco/uQuery/uQuery-Document.cs +++ b/umbraco/presentation/umbraco/uQuery/uQuery-Document.cs @@ -10,7 +10,7 @@ namespace umbraco /// /// string csv of IDs /// collection or emtpy collection - public static List GetDocumentsByCsv(string csv) + public static IEnumerable GetDocumentsByCsv(string csv) { var documents = new List(); var ids = uQuery.GetCsvIds(csv); @@ -35,7 +35,7 @@ namespace umbraco /// /// The XML. /// - public static List GetDocumentsByXml(string xml) + public static IEnumerable GetDocumentsByXml(string xml) { var documents = new List(); var ids = uQuery.GetXmlIds(xml); @@ -130,7 +130,7 @@ namespace umbraco /// /// generic list of Document objects /// a collection of document IDs and their text fields - public static Dictionary ToNameIds(this List documents) + public static Dictionary ToNameIds(this IEnumerable documents) { var dictionary = new Dictionary(); diff --git a/umbraco/presentation/umbraco/uQuery/uQuery-Media.cs b/umbraco/presentation/umbraco/uQuery/uQuery-Media.cs index 97acaacca2..c56b086012 100644 --- a/umbraco/presentation/umbraco/uQuery/uQuery-Media.cs +++ b/umbraco/presentation/umbraco/uQuery/uQuery-Media.cs @@ -10,7 +10,7 @@ namespace umbraco /// /// XPath expression /// collection or empty collection - public static List GetMediaByXPath(string xPath) + public static IEnumerable GetMediaByXPath(string xPath) { var media = new List(); var xmlDocument = uQuery.GetPublishedXml(UmbracoObjectType.Media); @@ -34,7 +34,7 @@ namespace umbraco /// /// string csv of IDs /// collection or emtpy collection - public static List GetMediaByCsv(string csv) + public static IEnumerable GetMediaByCsv(string csv) { var media = new List(); var ids = uQuery.GetCsvIds(csv); @@ -59,7 +59,7 @@ namespace umbraco /// /// The XML. /// - public static List GetMediaByXml(string xml) + public static IEnumerable GetMediaByXml(string xml) { var media = new List(); var ids = uQuery.GetXmlIds(xml); @@ -84,7 +84,7 @@ namespace umbraco /// /// name of node to look for /// list of nodes, or empty list - public static List GetMediaByName(string name) + public static IEnumerable GetMediaByName(string name) { return uQuery.GetMediaByXPath(string.Concat("descendant::*[@nodeName='", name, "']")); } @@ -94,7 +94,7 @@ namespace umbraco /// /// The media type alias /// list of media, or empty list - public static List GetMediaByType(string mediaTypeAlias) + public static IEnumerable GetMediaByType(string mediaTypeAlias) { // Both XML schema versions have this attribute return uQuery.GetMediaByXPath(string.Concat("descendant::*[@nodeTypeAlias='", mediaTypeAlias, "']")); @@ -143,7 +143,7 @@ namespace umbraco /// /// generic list of Media objects /// a collection of mediaIDs and their text fields - public static Dictionary ToNameIds(this List media) + public static Dictionary ToNameIds(this IEnumerable media) { var dictionary = new Dictionary(); diff --git a/umbraco/presentation/umbraco/uQuery/uQuery-Members.cs b/umbraco/presentation/umbraco/uQuery/uQuery-Members.cs index 5453e384bf..1a99a2bde2 100644 --- a/umbraco/presentation/umbraco/uQuery/uQuery-Members.cs +++ b/umbraco/presentation/umbraco/uQuery/uQuery-Members.cs @@ -10,7 +10,7 @@ namespace umbraco /// /// XPath expression /// collection or empty collection - public static List GetMembersByXPath(string xPath) + public static IEnumerable GetMembersByXPath(string xPath) { var members = new List(); var xmlDocument = uQuery.GetPublishedXml(UmbracoObjectType.Member); @@ -34,7 +34,7 @@ namespace umbraco /// /// string csv of IDs /// collection or emtpy collection - public static List GetMembersByCsv(string csv) + public static IEnumerable GetMembersByCsv(string csv) { var members = new List(); var ids = uQuery.GetCsvIds(csv); @@ -59,7 +59,7 @@ namespace umbraco /// /// The XML. /// - public static List GetMembersByXml(string xml) + public static IEnumerable GetMembersByXml(string xml) { var members = new List(); var ids = uQuery.GetXmlIds(xml); @@ -81,7 +81,7 @@ namespace umbraco /// /// The member type alias /// list of members, or empty list - public static List GetMembersByType(string memberTypeAlias) + public static IEnumerable GetMembersByType(string memberTypeAlias) { // Both XML schema versions have this attribute return uQuery.GetMembersByXPath(string.Concat("descendant::*[@nodeTypeAlias='", memberTypeAlias, "']")); @@ -131,7 +131,7 @@ namespace umbraco /// /// generic list of Member objects /// a collection of memberIDs and their login names - public static Dictionary ToNameIds(this List members) + public static Dictionary ToNameIds(this IEnumerable members) { var dictionary = new Dictionary(); diff --git a/umbraco/presentation/umbraco/uQuery/uQuery-Nodes.cs b/umbraco/presentation/umbraco/uQuery/uQuery-Nodes.cs index cba1e99acd..d1e14a3417 100644 --- a/umbraco/presentation/umbraco/uQuery/uQuery-Nodes.cs +++ b/umbraco/presentation/umbraco/uQuery/uQuery-Nodes.cs @@ -23,7 +23,7 @@ namespace umbraco /// XPath expression to get Nodes, can use $ancestorOrSelf which will use the current Node if published, else it'll use the nearest published parent /// $currentPage will be depreciated /// an empty collection or a collection of nodes - public static List GetNodesByXPath(string xpath) + public static IEnumerable GetNodesByXPath(string xpath) { var nodes = new List(); @@ -72,7 +72,7 @@ namespace umbraco /// /// string csv of Ids /// an empty collection or a collection or Nodes - public static List GetNodesByCsv(string csv) + public static IEnumerable GetNodesByCsv(string csv) { var nodes = new List(); var ids = uQuery.GetCsvIds(csv); @@ -104,7 +104,7 @@ namespace umbraco /// " /// /// an empty list or a list of nodes - public static List GetNodesByXml(string xml) + public static IEnumerable GetNodesByXml(string xml) { var nodes = new List(); var ids = uQuery.GetXmlIds(xml); @@ -129,7 +129,7 @@ namespace umbraco /// /// name of node to look for /// list of nodes, or empty list - public static List GetNodesByName(string name) + public static IEnumerable GetNodesByName(string name) { return uQuery.GetNodesByXPath(string.Concat("descendant::*[@nodeName='", name, "']")); } @@ -139,7 +139,7 @@ namespace umbraco /// /// The document type alias /// list of nodes, or empty list - public static List GetNodesByType(string documentTypeAlias) + public static IEnumerable GetNodesByType(string documentTypeAlias) { if (uQuery.IsLegacyXmlSchema()) { @@ -156,7 +156,7 @@ namespace umbraco /// /// The document type id. /// - public static List GetNodesByType(int documentTypeId) + public static IEnumerable GetNodesByType(int documentTypeId) { return uQuery.GetNodesByXPath(string.Concat("descendant::*[@nodeType='", documentTypeId, "']")); } @@ -346,7 +346,7 @@ namespace umbraco /// /// generic list of node objects /// a collection of nodeIDs and their names - public static Dictionary ToNameIds(this List nodes) + public static Dictionary ToNameIds(this IEnumerable nodes) { var dictionary = new Dictionary();