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

#196: Bugfixing and rendering content item type and title.

Browse Source
This commit is contained in:
Sipke Schoorstra
2014-07-24 00:00:22 -07:00
parent dd8212e2b7
commit d2d0c477a3
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/ContentAuditTrailEventShapes.cs
View File

@@ -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<string, object>)context.Shape.EventData;

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

@@ -67,11 +67,9 @@ namespace Orchard.AuditTrail.Providers.Content {
var eventData = new Dictionary<string, object> {
{"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) {

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

@@ -1,13 +1,16 @@
@using Orchard.AuditTrail.Helpers
@using Orchard.ContentManagement
@{
var eventData = (IDictionary<string, object>) Model.EventData;
var contentItemId = eventData.Get<int>("ContentId");
var contentItemVersionNumber = eventData.Get<int>("VersionNumber");
var isPublished = eventData.Get<bool>("Published");
var isLatest = eventData.Get<bool>("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;
}
<section class="audittrail-content-eventsummary">
@T("Version {0}", contentItemVersionNumber)
@T("{0} - {1} (version {2})", contentType, title, contentItemVersionNumber)
@if (isPublished) {
@T(" - ")
<a href="@Url.Action("Detail", "Content", new {area = "Orchard.AuditTrail", id = contentItemId, version = contentItemVersionNumber})">@T("View")</a>