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

More content event bug fixing.

Browse Source
This commit is contained in:
Sipke Schoorstra
2014-07-24 00:12:26 -07:00
parent d2d0c477a3
commit 799bd79d20
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/GlobalContentHandler.cs
View File

@@ -70,6 +70,7 @@ namespace Orchard.AuditTrail.Providers.Content {
{"ContentType", content.ContentItem.ContentType},
{"VersionId", content.ContentItem.VersionRecord.Id},
{"VersionNumber", content.ContentItem.VersionRecord.Number},
{"Published", content.ContentItem.VersionRecord.Published},
};
if (previousContentItemVersion != null) {

15
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.SummaryAdmin.cshtml
View File

@@ -1,19 +1,20 @@
@using Orchard.ContentManagement
@using Orchard.AuditTrail.Helpers
@using Orchard.ContentManagement
@{
var eventData = (IDictionary<string, object>) Model.EventData;
var contentItem = (ContentItem) Model.ContentItem;
var contentItemId = contentItem.Id;
var contentItemVersionNumber = contentItem.Version;
var eventVersionNumber = eventData.Get<int>("VersionNumber");
var eventIsPublished = eventData.Get<bool>("Published");
var contentType = contentItem.ContentType;
var title = Html.ItemDisplayText(contentItem);
var isPublished = contentItem.VersionRecord.Published;
var isLatest = contentItem.VersionRecord.Latest;
var isLatest = contentItem.VersionRecord.Number == eventVersionNumber;
}
<section class="audittrail-content-eventsummary">
@T("{0} - {1} (version {2})", contentType, title, contentItemVersionNumber)
@if (isPublished) {
@T("{0} - {1} (version {2})", contentType, title, eventVersionNumber)
@if (eventIsPublished) {
@T(" - ")
<a href="@Url.Action("Detail", "Content", new {area = "Orchard.AuditTrail", id = contentItemId, version = contentItemVersionNumber})">@T("View")</a>
<a href="@Url.Action("Detail", "Content", new { area = "Orchard.AuditTrail", id = contentItemId, version = eventVersionNumber })">@T("View")</a>
}
else if (isLatest) {
@T(" - ")