diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js index 6e3d085fa7..d2f12c430d 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js @@ -10,7 +10,7 @@ scope.allowOpenMediaType = true; // get document type details - scope.mediaType = scope.node.documentType.value; + scope.mediaType = scope.node.contentType.value; // get node url scope.nodeUrl = scope.node.mediaLink; diff --git a/src/Umbraco.Web/Models/ContentEditing/MediaItemDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/MediaItemDisplay.cs index 9941d48d48..eb209abfd2 100644 --- a/src/Umbraco.Web/Models/ContentEditing/MediaItemDisplay.cs +++ b/src/Umbraco.Web/Models/ContentEditing/MediaItemDisplay.cs @@ -10,8 +10,8 @@ namespace Umbraco.Web.Models.ContentEditing [DataContract(Name = "content", Namespace = "")] public class MediaItemDisplay : ListViewAwareContentItemDisplayBase { - [DataMember(Name = "documentType")] - public ContentPropertyDisplay DocumentType { get; set; } + [DataMember(Name = "contentType")] + public ContentPropertyDisplay ContentType { get; set; } [DataMember(Name = "mediaLink")] public string MediaLink { get; set; } diff --git a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs index fd1d3b456f..b1788bbf52 100644 --- a/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs @@ -42,7 +42,7 @@ namespace Umbraco.Web.Models.Mapping .ForMember(display => display.IsContainer, expression => expression.Ignore()) .ForMember(display => display.HasPublishedVersion, expression => expression.Ignore()) .ForMember(display => display.Tabs, expression => expression.ResolveUsing(new TabsAndPropertiesResolver(applicationContext.Services.TextService))) - .ForMember(display => display.DocumentType, expression => expression.ResolveUsing()) + .ForMember(display => display.ContentType, expression => expression.ResolveUsing()) .ForMember(display => display.MediaLink, expression => expression.ResolveUsing( content => string.Join(",", content.GetUrls(UmbracoConfig.For.UmbracoSettings().Content, applicationContext.ProfilingLogger.Logger)))) .AfterMap((media, display) => AfterMap(media, display, applicationContext.Services.DataTypeService, applicationContext.Services.TextService, applicationContext.Services.ContentTypeService, applicationContext.ProfilingLogger.Logger)); @@ -111,7 +111,7 @@ namespace Umbraco.Web.Models.Mapping /// Resolves a from the item and checks if the current user /// has access to see this data /// - private class ContentTypeBasicResolver : ValueResolver + private class MediaTypeBasicResolver : ValueResolver { protected override ContentTypeBasic ResolveCore(IMedia source) {