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

Rendering newlines as <br/> when displaying audit trail event comments.

Browse Source
This commit is contained in:
Sipke Schoorstra
2014-08-07 17:30:51 -07:00
parent 4f76653f06
commit 6b70c086b0
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Web/Modules/Orchard.AuditTrail/Helpers/StringExtensions.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using System.Text.RegularExpressions;
using Orchard.Localization; using Orchard.Localization;
namespace Orchard.AuditTrail.Helpers { namespace Orchard.AuditTrail.Helpers {
@@ -17,5 +18,9 @@ namespace Orchard.AuditTrail.Helpers {
public static string OrIfEmpty(this string value, LocalizedString emptyString) { public static string OrIfEmpty(this string value, LocalizedString emptyString) {
return String.IsNullOrWhiteSpace(value) ? emptyString.Text : value; return String.IsNullOrWhiteSpace(value) ? emptyString.Text : value;
} }
public static string NewlinesToHtml(this string value) {
return String.IsNullOrWhiteSpace(value) ? value : Regex.Replace(value, @"\n", "<br/>");
}
} }
} }

5
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Admin/Index.cshtml
View File

@@ -1,4 +1,5 @@
@using Orchard.AuditTrail.Services.Models @using Orchard.AuditTrail.Helpers
@using Orchard.AuditTrail.Services.Models
@model Orchard.AuditTrail.ViewModels.AuditTrailViewModel @model Orchard.AuditTrail.ViewModels.AuditTrailViewModel
@{ @{
Style.Include("audittrail-display.css"); Style.Include("audittrail-display.css");
@@ -51,7 +52,7 @@
<td class="user-column">@record.Record.UserName</td> <td class="user-column">@record.Record.UserName</td>
<td class="timestamp-column">@Display.DateTime(DateTimeUtc: record.Record.CreatedUtc)</td> <td class="timestamp-column">@Display.DateTime(DateTimeUtc: record.Record.CreatedUtc)</td>
<td class="summary-column">@Display(record.SummaryShape)</td> <td class="summary-column">@Display(record.SummaryShape)</td>
<td class="comment-column">@record.Record.Comment</td> <td class="comment-column">@Html.Raw(record.Record.Comment.NewlinesToHtml())</td>
<td class="actions-column">@Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Record.Id, area = "Orchard.AuditTrail" }, null)</td> <td class="actions-column">@Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Record.Id, area = "Orchard.AuditTrail" }, null)</td>
</tr> </tr>
} }

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

@@ -31,7 +31,7 @@
} }
@if (!String.IsNullOrWhiteSpace(record.Comment)) { @if (!String.IsNullOrWhiteSpace(record.Comment)) {
@T("Comment:")<br /> @T("Comment:")<br />
@record.Comment @Html.Raw(record.Comment.NewlinesToHtml())
} }
</section> </section>

3
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Parts.AuditTrail.cshtml
View File

@@ -1,5 +1,6 @@
@using Orchard.AuditTrail.Models @using Orchard.AuditTrail.Models
@using Orchard.AuditTrail.ViewModels @using Orchard.AuditTrail.ViewModels
@using StringExtensions = Orchard.AuditTrail.Helpers.StringExtensions
@{ @{
Style.Include("audittrail-display.css"); Style.Include("audittrail-display.css");
Style.Include("audittrail-part.css"); Style.Include("audittrail-part.css");
@@ -39,7 +40,7 @@
<td class="user-column">@record.Record.UserName</td> <td class="user-column">@record.Record.UserName</td>
<td class="timestamp-column">@Display.DateTime(DateTimeUtc: record.Record.CreatedUtc)</td> <td class="timestamp-column">@Display.DateTime(DateTimeUtc: record.Record.CreatedUtc)</td>
<td class="summary-column">@Display(record.SummaryShape)</td> <td class="summary-column">@Display(record.SummaryShape)</td>
<td class="comment-column">@record.Record.Comment</td> <td class="comment-column">@Html.Raw(StringExtensions.NewlinesToHtml(record.Record.Comment))</td>
<td class="actions-column">@Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Record.Id, area = "Orchard.AuditTrail" }, null)</td> <td class="actions-column">@Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Record.Id, area = "Orchard.AuditTrail" }, null)</td>
</tr> </tr>
} }