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

Merge remote-tracking branch 'origin/v8/feature/version-history-cleanup-ui' into v9/feature/merge_and_clean_history_cleanup

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Models/ContentType.cs
#	src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Models/ContentEditing/HistoryCleanup.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
#	tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
This commit is contained in:
Bjarke Berg
2021-10-29 15:04:27 +02:00
parent a5c7af68cf 82a64ca589
commit 926c74dcba
7 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Models/ContentType.cs
View File

@@ -32,8 +32,11 @@ namespace Umbraco.Cms.Core.Models
/// </summary>
/// <remarks>Only use this for creating ContentTypes at the root (with ParentId -1).</remarks>
/// <param name="parentId"></param>
public ContentType(IShortStringHelper shortStringHelper, int parentId) : base(shortStringHelper, parentId) =>
public ContentType(IShortStringHelper shortStringHelper, int parentId) : base(shortStringHelper, parentId)
{
_allowedTemplates = new List<ITemplate>();
HistoryCleanup = new HistoryCleanup();
}
/// <summary>
@@ -43,8 +46,11 @@ namespace Umbraco.Cms.Core.Models
/// <param name="parent"></param>
/// <param name="alias"></param>
public ContentType(IShortStringHelper shortStringHelper, IContentType parent, string alias)
: base(shortStringHelper, parent, alias) =>
: base(shortStringHelper, parent, alias)
{
_allowedTemplates = new List<ITemplate>();
HistoryCleanup = new HistoryCleanup();
}
/// <inheritdoc />
public override bool SupportsPublishing => SupportsPublishingConst;

3
src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
View File

@@ -183,7 +183,8 @@ namespace Umbraco.Cms.Core.Models.Mapping
KeepAllVersionsNewerThanDays = source.HistoryCleanup.KeepAllVersionsNewerThanDays,
KeepLatestVersionPerDayForDays = source.HistoryCleanup.KeepLatestVersionPerDayForDays,
GlobalKeepAllVersionsNewerThanDays = _contentSettings.ContentVersionCleanupPolicy.KeepAllVersionsNewerThanDays,
GlobalKeepLatestVersionPerDayForDays = _contentSettings.ContentVersionCleanupPolicy.KeepLatestVersionPerDayForDays
GlobalKeepLatestVersionPerDayForDays = _contentSettings.ContentVersionCleanupPolicy.KeepLatestVersionPerDayForDays,
GlobalEnableCleanup = _contentSettings.ContentVersionCleanupPolicy.EnableCleanup
};
target.AllowCultureVariant = source.VariesByCulture();