Master Content Type enabled
- This Content Type uses
-
-
Master Content Type enabled
This Content Type uses
+
- A Container Content Type hides it's children in the tree, and instead injects a list based overview of children to the editing pane -
-
-
-
-
+
+
+
+ - Only Content Types with this checked can be created at the root level of Content and Media trees -
Master Content Type enabled
- This Content Type uses
-
+
+
+
+
+
Master Content Type enabled
This Content Type uses
Master Content Type enabled
- This Content Type uses
-
-
Master Content Type enabled
This Content Type uses
+
- A Container Content Type hides it's children in the tree, and instead injects a list based overview of children to the editing pane -
-
-
-
-
+
+
+
+ - Only Content Types with this checked can be created at the root level of Content and Media trees -
Master Content Type enabled
- This Content Type uses
-
+
+
+
+
+
Master Content Type enabled
This Content Type uses
" + + docDescription + "
'\n"); + + if (!typeInited) { - nodeType.Items.Add(li); - js.Append("typeInfo[" + counter + "] = '" + - docDescription + "
'\n"); - - if (!typeInited) - { - descr.Text = "" + - docDescription + "
"; - typeInited = true; - - } - counter++; + descr.Text = "" + + docDescription + "
"; + typeInited = true; + } + counter++; + } } - else if (dt.AllowAtRoot) - { + else { nodeType.Items.Add(li); js.Append("typeInfo[" + counter + "] = '" + docDescription + "
'\n"); if (!typeInited) { descr.Text = "" + - docDescription + "
"; + docDescription + "'"; typeInited = true; } counter++; @@ -85,8 +83,7 @@ namespace umbraco.cms.presentation.create.controls } - if (nodeType.Items.Count == 0) - { + if (nodeType.Items.Count == 0) { sbmt.Enabled = false; } typeJs.Text = "\n "; @@ -130,9 +127,9 @@ namespace umbraco.cms.presentation.create.controls int.Parse(Request["nodeID"]), rename.Text); - BasePage.Current.ClientTools - .ChangeContentFrameUrl(returnUrl) - .CloseModalWindow(); + BasePage.Current.ClientTools + .ChangeContentFrameUrl(returnUrl) + .CloseModalWindow(); } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs index dc66e6f8b2..2ae91676a5 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs @@ -38,7 +38,7 @@ namespace umbraco.cms.presentation.create.controls { foreach (int i in allowedIds) if (i == dt.Id) nodeType.Items.Add(li); } - else if (dt.AllowAtRoot) + else nodeType.Items.Add(li); } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs index 4d1177433d..9b782673c3 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installedPackage.aspx.cs @@ -459,13 +459,6 @@ namespace umbraco.presentation.developer.packages DocumentType s = new DocumentType(nId); if (s != null) { - // check for master doctypes - if (s.IsMaster()) - { - foreach(var ct in s.GetChildTypes()) - ct.RemoveParentContentType(s.Id); - } - s.delete(); pack.Data.Documenttypes.Remove(nId.ToString()); diff --git a/src/umbraco.cms/businesslogic/ContentType.cs b/src/umbraco.cms/businesslogic/ContentType.cs index 0a89941439..befaa03556 100644 --- a/src/umbraco.cms/businesslogic/ContentType.cs +++ b/src/umbraco.cms/businesslogic/ContentType.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Diagnostics; using System.Threading; using System.Runtime.CompilerServices; using System.Linq; @@ -76,17 +75,14 @@ namespace umbraco.cms.businesslogic /// all of the properties that are initialized normally from the database. /// This is used for performance reasons. /// - internal ContentType(int id, string alias, string icon, string thumbnail, int? masterContentType, bool? isContainer) + internal ContentType(int id, string alias, string icon, string thumbnail, int? masterContentType) : base(id, true) { _alias = alias; _iconurl = icon; _thumbnail = thumbnail; if (masterContentType.HasValue) - MasterContentType = masterContentType.Value; - - if (isContainer.HasValue) - _isContainerContentType = isContainer.Value; + m_masterContentType = masterContentType.Value; } #endregion @@ -95,7 +91,7 @@ namespace umbraco.cms.businesslogic protected internal const string m_SQLOptimizedGetAll = @" SELECT id, createDate, trashed, parentId, nodeObjectType, nodeUser, level, path, sortOrder, uniqueID, text, - allowAtRoot, isContainer, Alias,icon,thumbnail,description + masterContentType,Alias,icon,thumbnail,description FROM umbracoNode INNER JOIN cmsContentType ON umbracoNode.id = cmsContentType.nodeId WHERE nodeObjectType = @nodeObjectType"; @@ -168,24 +164,74 @@ namespace umbraco.cms.businesslogic return _propertyTypeCache[key]; } - // With 4.10 we can't do this via direct SQL as we have content type mixins + //Instead of going via API, run this query to find the control type + //by-passes a lot of queries just to determine if this is a true/false data type + + //This SQL returns a larger recordset than intended + //causing controlId to sometimes be null instead of correct + //because all properties for the type are returned + //side effect of changing inner join to left join when adding masterContentType + //string sql = "select " + + // "cmsDataType.controlId, masterContentType.alias as masterAlias " + + // "from " + + // "cmsContentType " + + // "inner join cmsPropertyType on (cmsContentType.nodeId = cmsPropertyType.contentTypeId) " + + // "left join cmsDataType on (cmsPropertyType.dataTypeId = cmsDataType.nodeId) and cmsPropertyType.Alias = @propertyAlias " + + // "left join cmsContentType masterContentType on masterContentType.nodeid = cmsContentType.masterContentType " + + // "where cmsContentType.alias = @contentTypeAlias"; + + //this SQL correctly returns a single row when the property exists, but still returns masterAlias if it doesn't + string sql = "select cmsDataType.controlId, masterContentType.alias as masterAlias " + + "from " + + "cmsContentType " + + "left join cmsPropertyType on (cmsContentType.nodeId = cmsPropertyType.contentTypeId and cmsPropertyType.Alias = @propertyAlias) " + + "left join cmsDataType on (cmsPropertyType.dataTypeId = cmsDataType.nodeId) " + + "left join cmsContentType masterContentType on masterContentType.nodeid = cmsContentType.masterContentType " + + "where " + + "cmsContentType.alias = @contentTypeAlias"; + + //Ensure that getdatatype doesn't throw an exception + //http://our.umbraco.org/forum/developers/razor/18085-Access-custom-node-properties-with-Razor + + //grab the controlid or test for parent Guid controlId = Guid.Empty; - ContentType ct = GetByAlias(contentTypeAlias); - PropertyType pt = ct.getPropertyType(propertyTypeAlias); - if (pt != null) + IRecordsReader reader = null; + try { - controlId = pt.DataTypeDefinition.DataType.Id; + reader = Application.SqlHelper.ExecuteReader(sql, + Application.SqlHelper.CreateParameter("@contentTypeAlias", contentTypeAlias), + Application.SqlHelper.CreateParameter("@propertyAlias", propertyTypeAlias) + ); + if (reader.Read()) + { + if (!reader.IsNull("controlId")) + controlId = reader.GetGuid("controlId"); + else if (!reader.IsNull("masterAlias") && !String.IsNullOrEmpty(reader.GetString("masterAlias"))) + { + controlId = GetDataType(reader.GetString("masterAlias"), propertyTypeAlias); + } + + } + } + catch (UmbracoException) + { + _propertyTypeCache.Add(key, controlId); + } + finally + { + if (reader != null) + { + reader.Close(); + } } - //add to cache (even if empty!) + //add to cache if (!_propertyTypeCache.ContainsKey(key)) { _propertyTypeCache.Add(key, controlId); } - return controlId; - } @@ -268,7 +314,7 @@ namespace umbraco.cms.businesslogic ///