U4-8065 Inherited from is empty - reverts 10617d1bd5, turns out this is why we needed that property value

This commit is contained in:
Shannon
2016-03-15 15:08:53 +01:00
parent 710dda164f
commit d5fe8c11c8
2 changed files with 11 additions and 2 deletions

View File

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

View File

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