Merge pull request #1174 from umbraco/temp-U4-8065

U4-8065 Inherited from is empty - reverts 10617d1bd52bdac57534a7d7b8…

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; }
-        
+
+        /// <summary>
+        /// This is required for the UI editor to know which content type name this property belongs
+        /// to based on the property inheritance structure
+        /// </summary>
+        [DataMember(Name = "contentTypeName")]
+        [ReadOnly(true)]
+        public string ContentTypeName { get; set; }
+
     }
 }

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
                 });
             }