lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Makes ContentItemId nullable for audit trail summary admin (#7824)

Browse Source
This commit is contained in:
Andrew Cartwright
2017-09-14 12:30:49 -07:00
committed by Sébastien Ros
parent 630613db75
commit 7b92bee1fc
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml
+5 -6
View File
@@ -1,11 +1,11 @@
@using Orchard.AuditTrail.Helpers @using Orchard.AuditTrail.Helpers
@using Orchard.AuditTrail.Services.Models @using Orchard.AuditTrail.Services.Models
@using Orchard.ContentManagement @using Orchard.ContentManagement
@{ @{
var descriptor = (AuditTrailEventDescriptor)Model.Descriptor; var descriptor = (AuditTrailEventDescriptor)Model.Descriptor;
var eventData = (IDictionary<string, object>) Model.EventData; var eventData = (IDictionary<string, object>) Model.EventData;
var eventPastTense = descriptor.Name.Text.ToLower(); var eventPastTense = descriptor.Name.Text.ToLower();
var contentItemId = (int)Model.ContentItemId; var contentItemId = (int?)Model.ContentItemId;
var contentItem = (ContentItem) Model.ContentItem; var contentItem = (ContentItem) Model.ContentItem;
var eventVersionNumber = eventData.Get<int>("VersionNumber"); var eventVersionNumber = eventData.Get<int>("VersionNumber");
var isPublishedEvent = eventData.Get<bool>("Published"); var isPublishedEvent = eventData.Get<bool>("Published");
@@ -18,17 +18,16 @@
var isLatest = contentItem.VersionRecord.Number == eventVersionNumber; var isLatest = contentItem.VersionRecord.Number == eventVersionNumber;
var isRemoved = !contentItem.VersionRecord.Latest && !contentItem.VersionRecord.Published; var isRemoved = !contentItem.VersionRecord.Latest && !contentItem.VersionRecord.Published;
if (isPublishedEvent || isLatest) { 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("<strong>" + title + "</strong>") : 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("<strong>" + title + "</strong>") : Html.ItemEditLink(title, contentItemId.Value), eventPastTense)
} }
else if (isRemoved) { else if (isRemoved) {
@T("The {0} <strong>{1}</strong> was {2}.", contentType.ToLower(), title, eventPastTense) @T("The {0} <strong>{1}</strong> was {2}.", contentType.ToLower(), title, eventPastTense)
} }
else { 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 { else {
@T("<strong>Version {0}</strong> of content item <strong>{1}</strong> was {2}.", eventVersionNumber, title, eventPastTense) @T("<strong>Version {0}</strong> of content item <strong>{1}</strong> was {2}.", eventVersionNumber, title, eventPastTense)
} }
</section> </section>