From 7b92bee1fc51d55ef37572fdb5f91d3f123d11ab Mon Sep 17 00:00:00 2001 From: Andrew Cartwright Date: Thu, 14 Sep 2017 20:30:49 +0100 Subject: [PATCH] Makes ContentItemId nullable for audit trail summary admin (#7824) --- .../Views/AuditTrailEvent-Content.SummaryAdmin.cshtml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 0acfc563a..81ec6e3b1 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,11 +1,11 @@ -@using Orchard.AuditTrail.Helpers +@using Orchard.AuditTrail.Helpers @using Orchard.AuditTrail.Services.Models @using Orchard.ContentManagement @{ var descriptor = (AuditTrailEventDescriptor)Model.Descriptor; var eventData = (IDictionary) Model.EventData; var eventPastTense = descriptor.Name.Text.ToLower(); - var contentItemId = (int)Model.ContentItemId; + var contentItemId = (int?)Model.ContentItemId; var contentItem = (ContentItem) Model.ContentItem; var eventVersionNumber = eventData.Get("VersionNumber"); var isPublishedEvent = eventData.Get("Published"); @@ -18,17 +18,16 @@ var isLatest = contentItem.VersionRecord.Number == eventVersionNumber; var isRemoved = !contentItem.VersionRecord.Latest && !contentItem.VersionRecord.Published; if (isPublishedEvent || isLatest) { - @T("{0} of the {1} {2} was {3}.", Html.ActionLink(T("Version {0}", eventVersionNumber).Text, "Detail", "Content", new { area = "Orchard.AuditTrail", id = contentItemId, version = eventVersionNumber }, null), contentType.ToLower(), isRemoved ? Html.Raw("" + title + "") : Html.ItemEditLink(title, contentItemId), eventPastTense) + @T("{0} of the {1} {2} was {3}.", Html.ActionLink(T("Version {0}", eventVersionNumber).Text, "Detail", "Content", new { area = "Orchard.AuditTrail", id = contentItemId.Value, version = eventVersionNumber }, null), contentType.ToLower(), isRemoved ? Html.Raw("" + title + "") : Html.ItemEditLink(title, contentItemId.Value), eventPastTense) } else if (isRemoved) { @T("The {0} {1} was {2}.", contentType.ToLower(), title, eventPastTense) } else { - @T("The {0} {1} was {2}.", contentType.ToLower(), Html.ItemEditLink(title, contentItemId), eventPastTense) - + @T("The {0} {1} was {2}.", contentType.ToLower(), Html.ItemEditLink(title, contentItemId.Value), eventPastTense) } } else { @T("Version {0} of content item {1} was {2}.", eventVersionNumber, title, eventPastTense) } - \ No newline at end of file +