From be884466c9d53863a6a3bae0c9aed633f2ddfbf0 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Sat, 12 Jul 2014 23:21:18 -0700 Subject: [PATCH] Recording minimum run interval setting. --- .../Handlers/AuditTrailTrimmingSettingsPartHandler.cs | 9 +++++++-- ...ent-AuditTrailSettings-TrimmingSettingsChanged.cshtml | 5 ++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Handlers/AuditTrailTrimmingSettingsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Handlers/AuditTrailTrimmingSettingsPartHandler.cs index bd9636e3f..374cffe45 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Handlers/AuditTrailTrimmingSettingsPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Handlers/AuditTrailTrimmingSettingsPartHandler.cs @@ -13,6 +13,7 @@ namespace Orchard.AuditTrail.Handlers { private int _oldRetentionPeriod; private readonly IAuditTrailManager _auditTrailManager; private readonly IWorkContextAccessor _wca; + private int _oldMinimumRunInterval; public AuditTrailTrimmingSettingsPartHandler(IAuditTrailManager auditTrailManager, IWorkContextAccessor wca) { _auditTrailManager = auditTrailManager; @@ -32,12 +33,14 @@ namespace Orchard.AuditTrail.Handlers { private void BeginUpdateEvent(UpdateContentContext context, AuditTrailTrimmingSettingsPart part) { _oldRetentionPeriod = part.RetentionPeriod; + _oldMinimumRunInterval = part.MinimumRunInterval; } private void EndUpdateEvent(UpdateContentContext context, AuditTrailTrimmingSettingsPart part) { var newRetentionPeriod = part.RetentionPeriod; + var newMinimumRunInterval = part.MinimumRunInterval; - if (newRetentionPeriod == _oldRetentionPeriod) + if (newRetentionPeriod == _oldRetentionPeriod && newMinimumRunInterval == _oldMinimumRunInterval) return; _auditTrailManager.CreateRecord( @@ -45,7 +48,9 @@ namespace Orchard.AuditTrail.Handlers { user: _wca.GetContext().CurrentUser, eventData: new Dictionary { {"OldRetentionPeriod", _oldRetentionPeriod}, - {"NewRetentionPeriod", newRetentionPeriod} + {"NewRetentionPeriod", newRetentionPeriod}, + {"OldMinimumRunInterval", _oldMinimumRunInterval}, + {"NewMinimumRunInterval", newMinimumRunInterval} }); } } diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-AuditTrailSettings-TrimmingSettingsChanged.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-AuditTrailSettings-TrimmingSettingsChanged.cshtml index f68bcfd2c..4a99c542f 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-AuditTrailSettings-TrimmingSettingsChanged.cshtml +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-AuditTrailSettings-TrimmingSettingsChanged.cshtml @@ -3,8 +3,11 @@ var eventData = (IDictionary)Model.EventData; var oldRetentionPeriod = eventData.Get("OldRetentionPeriod"); var newRetentionPeriod = eventData.Get("NewRetentionPeriod"); + var oldMinimumRunInterval = eventData.Get("OldMinimumRunInterval"); + var newMinimumRunInterval = eventData.Get("NewMinimumRunInterval"); }
- @T("Trimming retention period changed from {0} to {1}", oldRetentionPeriod, newRetentionPeriod) +
@T("Trimming retention period changed from {0} to {1}", oldRetentionPeriod, newRetentionPeriod)
+
@T("Minimum run interval changed from {0} to {1}", oldMinimumRunInterval, newMinimumRunInterval)
\ No newline at end of file