Skip to content

Commit 82a64ca

Browse files
committed
Add message if prevent cleanup is globally disabled.
1 parent b0ff096 commit 82a64ca

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ <h5><localize key="contentTypeEditor_historyCleanupHeading"></localize></h5>
102102

103103
<div class="sub-view-column-right">
104104
<umb-box-content>
105+
<p ></p>
106+
107+
<div class="umb-panel-group__details-status-text" ng-if="model.historyCleanup.globalEnableCleanup">
108+
<p class="umb-panel-group__details-status-action"><localize key="contentTypeEditor_historyCleanupGloballyDisabled"></localize></p>
109+
</div>
110+
105111
<umb-control-group label="@contentTypeEditor_historyCleanupPreventCleanup">
106112
<umb-toggle checked="model.historyCleanup.preventCleanup" on-click="vm.toggleHistoryCleanupPreventCleanup()"></umb-toggle>
107113
</umb-control-group>

src/Umbraco.Web.UI/Umbraco/config/lang/en.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,6 +1724,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
17241724
<key alias="historyCleanupKeepAllVersionsNewerThanDays">Keep all versions newer than days</key>
17251725
<key alias="historyCleanupKeepLatestVersionPerDayForDays">Keep latest version per day for days</key>
17261726
<key alias="historyCleanupPreventCleanup">Prevent cleanup</key>
1727+
<key alias="historyCleanupGloballyDisabled">NOTE! The cleanup of historically content versions are disabled globally. These settings will not take effect before it is enabled.</key>
17271728
</area>
17281729
<area alias="languages">
17291730
<key alias="addLanguage">Add language</key>

src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,6 +1755,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
17551755
<key alias="historyCleanupKeepAllVersionsNewerThanDays">Keep all versions newer than days</key>
17561756
<key alias="historyCleanupKeepLatestVersionPerDayForDays">Keep latest version per day for days</key>
17571757
<key alias="historyCleanupPreventCleanup">Prevent cleanup</key>
1758+
<key alias="historyCleanupGloballyDisabled">NOTE! The cleanup of historically content versions are disabled globally. These settings will not take effect before it is enabled.</key>
17581759
</area>
17591760
<area alias="languages">
17601761
<key alias="addLanguage">Add language</key>

src/Umbraco.Web/Models/ContentEditing/HistoryCleanup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class HistoryCleanupViewModel : HistoryCleanup
1212
[DataMember(Name = "globalKeepLatestVersionPerDayForDays")]
1313
public int? GlobalKeepLatestVersionPerDayForDays { get; set;}
1414

15-
[DataMember(Name = "GlobalEnableCleanup")]
15+
[DataMember(Name = "globalEnableCleanup")]
1616
public bool GlobalEnableCleanup { get; set; }
1717
}
1818

0 commit comments

Comments
 (0)