diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/ContentAuditTrailEventShapes.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/ContentAuditTrailEventShapes.cs index ce2d9659a..c2392bf4a 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/ContentAuditTrailEventShapes.cs +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/ContentAuditTrailEventShapes.cs @@ -22,7 +22,7 @@ namespace Orchard.AuditTrail.Providers.Content { builder.Describe("AuditTrailEvent").OnDisplaying(context => { var record = (AuditTrailEventRecord)context.Shape.Record; - if (record.Category != "Content" || context.ShapeMetadata.DisplayType != "Detail") + if (record.Category != "Content") return; var eventData = (IDictionary)context.Shape.EventData; diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/GlobalContentHandler.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/GlobalContentHandler.cs index 6244b4e84..31f47fe51 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/GlobalContentHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/GlobalContentHandler.cs @@ -67,11 +67,9 @@ namespace Orchard.AuditTrail.Providers.Content { var eventData = new Dictionary { {"ContentId", content.Id}, {"ContentIdentity", _contentManager.GetItemMetadata(content).Identity.ToString()}, + {"ContentType", content.ContentItem.ContentType}, {"VersionId", content.ContentItem.VersionRecord.Id}, {"VersionNumber", content.ContentItem.VersionRecord.Number}, - {"Published", content.ContentItem.VersionRecord.Published}, - {"Latest", content.ContentItem.VersionRecord.Latest}, - {"Title", title} }; if (previousContentItemVersion != null) { diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml index 7e2e123b4..a14cf29cd 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml @@ -1,13 +1,16 @@ -@using Orchard.AuditTrail.Helpers +@using Orchard.ContentManagement @{ var eventData = (IDictionary) Model.EventData; - var contentItemId = eventData.Get("ContentId"); - var contentItemVersionNumber = eventData.Get("VersionNumber"); - var isPublished = eventData.Get("Published"); - var isLatest = eventData.Get("Latest"); + var contentItem = (ContentItem) Model.ContentItem; + var contentItemId = contentItem.Id; + var contentItemVersionNumber = contentItem.Version; + var contentType = contentItem.ContentType; + var title = Html.ItemDisplayText(contentItem); + var isPublished = contentItem.VersionRecord.Published; + var isLatest = contentItem.VersionRecord.Latest; }
- @T("Version {0}", contentItemVersionNumber) + @T("{0} - {1} (version {2})", contentType, title, contentItemVersionNumber) @if (isPublished) { @T(" - ") @T("View")