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

Merge remote-tracking branch 'origin/v13/dev' into v14/dev

Browse Source 
# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Cms.Api.Delivery/Controllers/DeliveryApiControllerBase.cs
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
#	src/Umbraco.Infrastructure/PropertyEditors/FileUploadPropertyValueEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs
This commit is contained in:
Bjarke Berg
2023-08-28 11:46:22 +02:00
parent b17a7689ab d43e6abc8b
commit 6fbf04592c
126 changed files with 2396 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Infrastructure/Models/DeliveryApi/ApiMediaWithCrops.cs
View File

@@ -2,7 +2,7 @@ using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
namespace Umbraco.Cms.Core.Models.DeliveryApi;
internal sealed class ApiMediaWithCrops : IApiMedia
public class ApiMediaWithCrops : IApiMedia
{
private readonly IApiMedia _inner;

26
src/Umbraco.Infrastructure/Models/DeliveryApi/ApiMediaWithCropsResponse.cs Normal file
View File

@@ -0,0 +1,26 @@
using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
namespace Umbraco.Cms.Core.Models.DeliveryApi;
public sealed class ApiMediaWithCropsResponse : ApiMediaWithCrops
{
public ApiMediaWithCropsResponse(
IApiMedia inner,
ImageCropperValue.ImageCropperFocalPoint? focalPoint,
IEnumerable<ImageCropperValue.ImageCropperCrop>? crops,
string path,
DateTime createDate,
DateTime updateDate)
: base(inner, focalPoint, crops)
{
Path = path;
CreateDate = createDate;
UpdateDate = updateDate;
}
public string Path { get; }
public DateTime CreateDate { get; }
public DateTime UpdateDate { get; }
}

5
src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
View File

@@ -276,6 +276,11 @@ public class EntityMapDefinition : IMapDefinition
{
target.AdditionalData.Add("contentType", source.Values[ExamineFieldNames.ItemTypeFieldName]);
}
if (source.Values.ContainsKey(UmbracoExamineFieldNames.PublishedFieldName))
{
target.AdditionalData.Add("published", string.Equals(source.Values[UmbracoExamineFieldNames.PublishedFieldName], "y", StringComparison.InvariantCultureIgnoreCase));
}
}
private static string? MapContentTypeIcon(IEntitySlim entity)