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

Added content identity to event data and performed some minor renaming.

Browse Source
This commit is contained in:
Sipke Schoorstra
2014-07-01 20:40:23 -07:00
parent d8437d3435
commit 43ad30c3fb
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
View File

@@ -136,7 +136,9 @@
<Content Include="Views\AuditTrailFilter-ContentItem.cshtml" />
<Content Include="Views\AuditTrailFilter-Common-Category.cshtml" />
<Content Include="Views\Content\Detail.cshtml" />
<Content Include="Views\AuditTrailEvent-Content - Copy.cshtml" />
<Content Include="Views\AuditTrailEvent-Content.cshtml">
<SubType>Code</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">

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

@@ -24,8 +24,8 @@ namespace Orchard.AuditTrail.Providers.Content {
return;
var eventData = (IDictionary<string, object>)context.Shape.EventData;
var contentItemId = eventData.Get<int>("ContentItemId");
var previousContentItemVersionId = eventData.Get<int>("PreviousContentItemVersionId");
var contentItemId = eventData.Get<int>("ContentId");
var previousContentItemVersionId = eventData.Get<int>("PreviousVersionId");
var contentItem = _contentManager.Value.Get(contentItemId);
var previousVersion = previousContentItemVersionId > 0 ? _contentManager.Value.Get(contentItemId, VersionOptions.VersionRecord(previousContentItemVersionId)) : default(ContentItem);

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

@@ -52,14 +52,16 @@ namespace Orchard.AuditTrail.Providers.Content {
};
var eventData = new Dictionary<string, object> {
{"ContentItemId", content.Id},
{"ContentItemVersionId", content.ContentItem.VersionRecord.Id},
{"ContentItemVersionNumber", content.ContentItem.VersionRecord.Number},
{"ContentId", content.Id},
{"ContentIdentity", _contentManager.GetItemMetadata(content).Identity.ToString()},
{"VersionId", content.ContentItem.VersionRecord.Id},
{"VersionNumber", content.ContentItem.VersionRecord.Number},
{"Title", title}
};
if (previousContentItemVersion != null) {
eventData["PreviousContentItemVersionId"] = previousContentItemVersion.Id;
eventData["PreviousVersionId"] = previousContentItemVersion.Id;
eventData["PreviousVersionNumber"] = previousContentItemVersion.Number;
}
_auditTrailManager.CreateRecord<ContentAuditTrailEventProvider>(

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

@@ -2,8 +2,8 @@
@{
var eventData = (IDictionary<string, object>) Model.EventData;
var title = eventData.Get<string>("Title");
var contentItemId = eventData.Get<int>("ContentItemId");
var contentItemVersionNumber = eventData.Get<int>("ContentItemVersionNumber");
var contentItemId = eventData.Get<int>("ContentId");
var contentItemVersionNumber = eventData.Get<int>("VersionNumber");
}
<section class="event-content">

0
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content - Copy.cshtml → src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.cshtml
View File