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

Check the cases where there might be a custom image type, instead of an the default Umbraco image type (#14463)

Browse Source
This commit is contained in:
Elitsa Marinovska
2023-06-27 10:33:46 +02:00
committed by GitHub
parent 1133c4e7f2
commit fe1080dd64
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
View File

@@ -760,11 +760,25 @@ public class MediaController : ContentControllerBase
break;
}
// If media type is still File then let's check if it's an image.
// If media type is still File then let's check if it's an image or a custom image type.
if (mediaTypeAlias == Constants.Conventions.MediaTypes.File &&
_imageUrlGenerator.IsSupportedImageFormat(ext))
{
mediaTypeAlias = Constants.Conventions.MediaTypes.Image;
if (allowedContentTypes.Any(mt => mt.Alias == Constants.Conventions.MediaTypes.Image))
{
mediaTypeAlias = Constants.Conventions.MediaTypes.Image;
}
else
{
IMediaType? customType = allowedContentTypes.FirstOrDefault(mt =>
mt.CompositionPropertyTypes.Any(pt =>
pt.PropertyEditorAlias == Constants.PropertyEditors.Aliases.ImageCropper));
if (customType is not null)
{
mediaTypeAlias = customType.Alias;
}
}
}
}
else