diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Helpers/StringExtensions.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Helpers/StringExtensions.cs index 644e06917..d9715dc14 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Helpers/StringExtensions.cs +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Helpers/StringExtensions.cs @@ -1,4 +1,5 @@ using System; +using System.Text.RegularExpressions; using Orchard.Localization; namespace Orchard.AuditTrail.Helpers { @@ -17,5 +18,9 @@ namespace Orchard.AuditTrail.Helpers { public static string OrIfEmpty(this string value, LocalizedString emptyString) { return String.IsNullOrWhiteSpace(value) ? emptyString.Text : value; } + + public static string NewlinesToHtml(this string value) { + return String.IsNullOrWhiteSpace(value) ? value : Regex.Replace(value, @"\n", "
"); + } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Admin/Index.cshtml index 30e3078ae..d9b67168e 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Admin/Index.cshtml @@ -1,4 +1,5 @@ -@using Orchard.AuditTrail.Services.Models +@using Orchard.AuditTrail.Helpers +@using Orchard.AuditTrail.Services.Models @model Orchard.AuditTrail.ViewModels.AuditTrailViewModel @{ Style.Include("audittrail-display.css"); @@ -51,7 +52,7 @@ @record.Record.UserName @Display.DateTime(DateTimeUtc: record.Record.CreatedUtc) @Display(record.SummaryShape) - @record.Record.Comment + @Html.Raw(record.Record.Comment.NewlinesToHtml()) @Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Record.Id, area = "Orchard.AuditTrail" }, null) } diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.cshtml index 522190362..309ef4917 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.cshtml +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEvent-Content.cshtml @@ -31,7 +31,7 @@ } @if (!String.IsNullOrWhiteSpace(record.Comment)) { @T("Comment:")
- @record.Comment + @Html.Raw(record.Comment.NewlinesToHtml()) } diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Parts.AuditTrail.cshtml b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Parts.AuditTrail.cshtml index 91047c687..c548a925c 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Parts.AuditTrail.cshtml +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Parts.AuditTrail.cshtml @@ -1,5 +1,6 @@ @using Orchard.AuditTrail.Models @using Orchard.AuditTrail.ViewModels +@using StringExtensions = Orchard.AuditTrail.Helpers.StringExtensions @{ Style.Include("audittrail-display.css"); Style.Include("audittrail-part.css"); @@ -39,7 +40,7 @@ @record.Record.UserName @Display.DateTime(DateTimeUtc: record.Record.CreatedUtc) @Display(record.SummaryShape) - @record.Record.Comment + @Html.Raw(StringExtensions.NewlinesToHtml(record.Record.Comment)) @Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Record.Id, area = "Orchard.AuditTrail" }, null) }