yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed a few properties and a class

Browse Source
This commit is contained in:
Robert
2017-10-03 15:35:36 +02:00
parent e643189b10
commit 5eb609d8a0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
View File

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

4
src/Umbraco.Web/Models/ContentEditing/MediaItemDisplay.cs
View File

@@ -10,8 +10,8 @@ namespace Umbraco.Web.Models.ContentEditing
[DataContract(Name = "content", Namespace = "")]
public class MediaItemDisplay : ListViewAwareContentItemDisplayBase<ContentPropertyDisplay, IMedia>
{
[DataMember(Name = "documentType")]
public ContentPropertyDisplay DocumentType { get; set; }
[DataMember(Name = "contentType")]
public ContentPropertyDisplay ContentType { get; set; }
[DataMember(Name = "mediaLink")]
public string MediaLink { get; set; }

4
src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
View File

@@ -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<ContentTypeBasicResolver>())
.ForMember(display => display.ContentType, expression => expression.ResolveUsing<MediaTypeBasicResolver>())
.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 <see cref="ContentTypeBasic"/> from the <see cref="IContent"/> item and checks if the current user
/// has access to see this data
/// </summary>
private class ContentTypeBasicResolver : ValueResolver<IMedia, ContentTypeBasic>
private class MediaTypeBasicResolver : ValueResolver<IMedia, ContentTypeBasic>
{
protected override ContentTypeBasic ResolveCore(IMedia source)
{