From d5fe8c11c8531cae0b6c65dffe7e863b1b6e1ce2 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 15 Mar 2016 15:08:53 +0100 Subject: [PATCH] U4-8065 Inherited from is empty - reverts 10617d1bd52bdac57534a7d7b868954f1185f9cf, turns out this is why we needed that property value --- .../Models/ContentEditing/PropertyTypeDisplay.cs | 10 +++++++++- .../Models/Mapping/PropertyTypeGroupResolver.cs | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/Models/ContentEditing/PropertyTypeDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/PropertyTypeDisplay.cs index c76f4b3a9d..4ee7c3eced 100644 --- a/src/Umbraco.Web/Models/ContentEditing/PropertyTypeDisplay.cs +++ b/src/Umbraco.Web/Models/ContentEditing/PropertyTypeDisplay.cs @@ -35,6 +35,14 @@ namespace Umbraco.Web.Models.ContentEditing [DataMember(Name = "contentTypeId")] [ReadOnly(true)] public int ContentTypeId { get; set; } - + + /// + /// This is required for the UI editor to know which content type name this property belongs + /// to based on the property inheritance structure + /// + [DataMember(Name = "contentTypeName")] + [ReadOnly(true)] + public string ContentTypeName { get; set; } + } } diff --git a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs index 6409fe8009..a2273b07b2 100644 --- a/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/PropertyTypeGroupResolver.cs @@ -218,7 +218,8 @@ namespace Umbraco.Web.Models.Mapping Inherited = inherited, DataTypeId = p.DataTypeDefinitionId, SortOrder = p.SortOrder, - ContentTypeId = contentType.Id + ContentTypeId = contentType.Id, + ContentTypeName = contentType.Name }); }