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

6
src/Umbraco.Web.UI.Client/src/views/documentTypes/views/permissions/permissions.html
View File

@@ -102,6 +102,12 @@
<div class="sub-view-column-right">
<umb-box-content>
<p ></p>
<div class="umb-panel-group__details-status-text" ng-if="model.historyCleanup.globalEnableCleanup">
<p class="umb-panel-group__details-status-action"><localize key="contentTypeEditor_historyCleanupGloballyDisabled"></localize></p>
</div>
<umb-control-group label="@contentTypeEditor_historyCleanupPreventCleanup">
<umb-toggle checked="model.historyCleanup.preventCleanup" on-click="vm.toggleHistoryCleanupPreventCleanup()"></umb-toggle>
</umb-control-group>