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

Ensure a media type correctly inherits it's selected parent

Browse Source 
(cherry picked from commit 28dd9aa081)
This commit is contained in:
Tom Pipe
2019-08-02 13:32:19 +01:00
committed by Sebastiaan Janssen
parent 12ad9dd36b
commit f829ac4e6c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web/Editors/MediaTypeController.cs
View File

@@ -145,9 +145,18 @@ namespace Umbraco.Web.Editors
}
public MediaTypeDisplay GetEmpty(int parentId)
{
var ct = new MediaType(parentId) {Icon = "icon-picture"};
IMediaType mt;
if (parentId != Constants.System.Root)
{
var parent = Services.ContentTypeService.GetMediaType(parentId);
mt = parent != null ? new MediaType(parent, string.Empty) : new MediaType(parentId);
}
else
mt = new MediaType(parentId);
var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(ct);
mt.Icon = "icon-picture";
var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(mt);
return dto;
}