swcs/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
This commit is contained in:
Tom Pipe
2019-08-02 15:08:46 +01:00
committed by Sebastiaan Janssen
parent eb8556c792
commit ab63d2664c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Web/Editors/MediaTypeController.cs
+11 -4
View File
@@ -19,6 +19,7 @@ using Umbraco.Core.Dictionary;
using Umbraco.Core.Logging;
using Umbraco.Core.Persistence;
using Umbraco.Web.Composing;
using IMediaType = Umbraco.Core.Models.IMediaType;
namespace Umbraco.Web.Editors
{
@@ -135,12 +136,18 @@ namespace Umbraco.Web.Editors
}
public MediaTypeDisplay GetEmpty(int parentId)
{
var ct = new MediaType(parentId)
IMediaType mt;
if (parentId != Constants.System.Root)
{
Icon = Constants.Icons.MediaImage
};
var parent = Services.MediaTypeService.Get(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 = Constants.Icons.MediaImage;
var dto = Mapper.Map<IMediaType, MediaTypeDisplay>(mt);
return dto;
}