#18607: Replacing new lines with <br /> in Text fields

Work Item: 18607

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros 2012-06-25 14:07:20 -07:00
parent 185ed552b0
commit 91675fc5a9
2 changed files with 5 additions and 6 deletions

View File

@ -39,10 +39,8 @@ namespace Orchard.Core.Common.Drivers {
var settings = field.PartFieldDefinition.Settings.GetModel<TextFieldSettings>();
object fieldValue = field.Value;
if (!string.IsNullOrWhiteSpace(settings.Flavor)) {
fieldValue = new HtmlString(_htmlFilters.Aggregate(field.Value, (text, filter) => filter.ProcessContent(text, settings.Flavor)));
}
fieldValue = new HtmlString(_htmlFilters.Aggregate(field.Value, (text, filter) => filter.ProcessContent(text, settings.Flavor)));
return shapeHelper.Fields_Common_Text(Name: field.Name, Value: fieldValue);
});
}

View File

@ -1,7 +1,8 @@
@{
@using Orchard.Utility.Extensions;
@{
string name = Model.ContentField.DisplayName;
}
@if (HasText(name) && HasText(Model.Value)) {
<p class="text-field"><span class="name">@name:</span> <span class="value">@Model.Value</span></p>
<p class="text-field"><span class="name">@name:</span> <span class="value">@(new MvcHtmlString(Html.Encode((HtmlString) Model.Value).ReplaceNewLinesWith("<br />$1")))</span></p>
}