From 50ee3fcd9d1405f2eb86afde4ffce12c1b612e6a Mon Sep 17 00:00:00 2001
From: Daniel Stolt <daniel.stolt@perceptible.net>
Date: Sun, 6 Jul 2014 18:47:46 +0200
Subject: [PATCH] Added display of last trimming run to settings UI.

---
 .../AuditTrailTrimmingSettingsPartDriver.cs       |  1 +
 .../Modules/Orchard.AuditTrail/Placement.info     |  4 ++--
 .../AuditTrailTrimmingSettingsViewModel.cs        |  3 +++
 .../Parts.AuditTrailTrimmingSettings.cshtml       | 15 +++++++++++----
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Drivers/AuditTrailTrimmingSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Drivers/AuditTrailTrimmingSettingsPartDriver.cs
index 59c29a4a3..2975bfab9 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Drivers/AuditTrailTrimmingSettingsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Drivers/AuditTrailTrimmingSettingsPartDriver.cs
@@ -25,6 +25,7 @@ namespace Orchard.AuditTrail.Drivers {
             return ContentShape("Parts_AuditTrailTrimmingSettings_Edit", () => {
                 var viewModel = new AuditTrailTrimmingSettingsViewModel {
                     RetentionPeriod = part.RetentionPeriod,
+                    LastRunUtc = part.LastRunUtc
                 };
 
                 if (updater != null) {
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Placement.info b/src/Orchard.Web/Modules/Orchard.AuditTrail/Placement.info
index ae18bc77f..72e74a5cc 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Placement.info
@@ -2,8 +2,8 @@
     <Place Parts_AuditTrail_Comment="Content:after.1"
            Parts_AuditTrail_Link="Content:after.2"
            Parts_AuditTrail="Content:after.3"
-           Parts_AuditTrailTrimmingSettings_Edit="Content:0"
-           Parts_AuditTrailSettings_Edit="Content:1"/>
+           Parts_AuditTrailSettings_Edit="Content:0"
+           Parts_AuditTrailTrimmingSettings_Edit="Content:1"/>
 
     <Match DisplayType="SummaryAdmin">
         <Place Parts_Contents_AuditTrail_SummaryAdmin="Actions:7"/>
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/ViewModels/AuditTrailTrimmingSettingsViewModel.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/ViewModels/AuditTrailTrimmingSettingsViewModel.cs
index 8b4a9868d..bbdfa8842 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/ViewModels/AuditTrailTrimmingSettingsViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/ViewModels/AuditTrailTrimmingSettingsViewModel.cs
@@ -1,5 +1,8 @@
+using System;
+
 namespace Orchard.AuditTrail.ViewModels {
     public class AuditTrailTrimmingSettingsViewModel {
         public int RetentionPeriod { get; set; }
+        public DateTime? LastRunUtc { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/EditorTemplates/Parts.AuditTrailTrimmingSettings.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/EditorTemplates/Parts.AuditTrailTrimmingSettings.cshtml
index 61b11ae6b..2c3dd5c17 100644
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/EditorTemplates/Parts.AuditTrailTrimmingSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/EditorTemplates/Parts.AuditTrailTrimmingSettings.cshtml
@@ -1,7 +1,14 @@
 @model Orchard.AuditTrail.ViewModels.AuditTrailTrimmingSettingsViewModel
 <section class="audittrail-trimming-settings-section">
     <h2>@T("Trimming settings")</h2>
-    @Html.LabelFor(m => m.RetentionPeriod, T("Retention period"))
-    @Html.TextBoxFor(m => m.RetentionPeriod, new { @class = "text small" })
-    <span class="hint">@T("The number of days of audit log data to retain.")</span>
-</section>
\ No newline at end of file
+    <fieldset>
+        @Html.LabelFor(m => m.RetentionPeriod, T("Retention period"))
+        @Html.TextBoxFor(m => m.RetentionPeriod, new { @class = "text small" })
+        <span class="hint">@T("The number of days of audit log data to retain.")</span>
+    </fieldset>
+    <fieldset>
+        @Html.LabelFor(m => m.LastRunUtc, T("Last run"))
+        @Html.TextBoxFor(m => m.LastRunUtc, new { @class = "text", disabled = "disabled" })
+        <span class="hint">@T("Indicates the last time the audit trail trimming process was run. The trimming process runs every 12 hours.")</span>
+    </fieldset>
+</section>