lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#197: Show audit trail event comment only in read only view.

Browse Source
This commit is contained in:
Sipke Schoorstra
2014-07-24 00:48:54 -07:00
parent 799bd79d20
commit e894497016
8 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Web/Modules/Orchard.AuditTrail/Controllers/ContentController.cs
View File

@@ -1,4 +1,5 @@
using System.Web.Mvc;
using Orchard.AuditTrail.Models;
using Orchard.ContentManagement;
using Orchard.Security;
using Orchard.UI.Admin;
@@ -19,6 +20,12 @@ namespace Orchard.AuditTrail.Controllers {
if (!_authorizer.Authorize(Core.Contents.Permissions.ViewContent, contentItem))
return new HttpUnauthorizedResult();
var auditTrailPart = contentItem.As<AuditTrailPart>();
if (auditTrailPart != null) {
auditTrailPart.ShowComment = true;
}
var editor = _contentManager.BuildEditor(contentItem);
return View(editor);
}

14
src/Orchard.Web/Modules/Orchard.AuditTrail/Drivers/AuditTrailPartDriver.cs
View File

@@ -32,10 +32,18 @@ namespace Orchard.AuditTrail.Drivers {
if (settings.ShowAuditTrailCommentInput) {
results.Add(ContentShape("Parts_AuditTrail_Comment", () => {
if (updater != null) {
updater.TryUpdateModel(part, Prefix, null, null);
var viewModel = new AuditTrailCommentViewModel();
if (part.ShowComment) {
viewModel.Comment = part.Comment;
}
return shapeHelper.EditorTemplate(Model: part, TemplateName: "Parts.AuditTrail.Comment", Prefix: Prefix);
if (updater != null) {
if (updater.TryUpdateModel(viewModel, Prefix, null, null)) {
part.Comment = viewModel.Comment;
}
}
return shapeHelper.EditorTemplate(Model: viewModel, TemplateName: "Parts.AuditTrail.Comment", Prefix: Prefix);
}));
}
if (_services.Authorizer.Authorize(Permissions.ViewAuditTrail)) {

6
src/Orchard.Web/Modules/Orchard.AuditTrail/Models/AuditTrailPart.cs
View File

@@ -3,8 +3,10 @@
namespace Orchard.AuditTrail.Models {
public class AuditTrailPart : ContentPart {
public string Comment {
get { return this.Retrieve(x => x.Comment); }
set { this.Store(x => x.Comment, value); }
get { return RetrieveVersioned<string>("Comment"); }
set { StoreVersioned("Comment", value); }
}
public bool ShowComment { get; set; }
}
}

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

@@ -255,6 +255,7 @@
<Compile Include="Providers\Content\ContentAuditTrailEventProvider.cs" />
<Compile Include="Services\IAuditTrailEventHandler.cs" />
<Compile Include="Services\IAuditTrailEventProvider.cs" />
<Compile Include="ViewModels\AuditTrailCommentViewModel.cs" />
<Compile Include="ViewModels\CommonAuditTrailFilterViewModel.cs" />
<Compile Include="Services\Models\AuditTrailOrderBy.cs" />
<Compile Include="ViewModels\AuditTrailViewModel.cs" />

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

@@ -13,7 +13,6 @@ namespace Orchard.AuditTrail.Providers.Content {
return;
context.Comment = auditTrailPart.Comment;
auditTrailPart.Comment = null; // Reset the comment.
}
}
}

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

@@ -58,8 +58,6 @@ namespace Orchard.AuditTrail.Providers.Content {
if (blackList.Contains(content.ContentItem.ContentType))
return;
var title = _contentManager.GetItemMetadata(content).DisplayText;
var properties = new Dictionary<string, object> {
{"Content", content}
};

5
src/Orchard.Web/Modules/Orchard.AuditTrail/ViewModels/AuditTrailCommentViewModel.cs Normal file
View File

@@ -0,0 +1,5 @@
namespace Orchard.AuditTrail.ViewModels {
public class AuditTrailCommentViewModel {
public string Comment { get; set; }
}
}

2
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/EditorTemplates/Parts.AuditTrail.Comment.cshtml
View File

@@ -1,4 +1,4 @@
@model Orchard.AuditTrail.Models.AuditTrailPart
@model Orchard.AuditTrail.ViewModels.AuditTrailCommentViewModel
<fieldset>
@Html.LabelFor(m => m.Comment, T("Comment"))
@Html.TextAreaFor(m => m.Comment)