From e29fb90298659a67b58711a64f0c23746817cb06 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 4 Dec 2015 00:18:27 +0100 Subject: [PATCH] Removed processing of tokens of RuntimeValue (Dynamic Forms). Also fixes #6117. (cherry picked from commit db564d1670854459b176459b432833202f98e157) --- .../Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/CommonFormElementDriver.cs | 1 - .../Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs | 4 ++-- .../Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs index a2c53f26b..983b6e6f7 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs @@ -68,7 +68,7 @@ namespace Orchard.DynamicForms.Drivers { protected override void OnDisplaying(CheckBox element, ElementDisplayContext context) { context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData()); context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData()); - context.ElementShape.ProcessedValue = _tokenizer.Replace(element.RuntimeValue, context.GetTokenData()); + context.ElementShape.ProcessedValue = _tokenizer.Replace(element.Value, context.GetTokenData()); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CommonFormElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CommonFormElementDriver.cs index 61e709acb..aac6de822 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CommonFormElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CommonFormElementDriver.cs @@ -44,7 +44,6 @@ namespace Orchard.DynamicForms.Drivers { protected override void OnDisplaying(FormElement element, ElementDisplayContext context) { context.ElementShape.Metadata.Wrappers.Add("FormElement_Wrapper"); context.ElementShape.Child.Add(New.PlaceChildContent(Source: context.ElementShape)); - } } diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs index 04d1e1121..5bd7ce5a2 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs @@ -79,7 +79,7 @@ namespace Orchard.DynamicForms.Drivers { protected override void OnDisplaying(EmailField element, ElementDisplayContext context) { context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData()); context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData()); - context.ElementShape.ProcessedValue = _tokenizer.Replace(element.RuntimeValue, context.GetTokenData()); + context.ElementShape.ProcessedValue = element.RuntimeValue; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs index 3d58122e6..6c1e3d7c1 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs @@ -36,7 +36,7 @@ namespace Orchard.DynamicForms.Drivers { protected override void OnDisplaying(HiddenField element, ElementDisplayContext context) { context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData()); - context.ElementShape.ProcessedValue = _tokenizer.Replace(element.Value, context.GetTokenData()); + context.ElementShape.ProcessedValue = element.Value; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs index 68336638e..9fd251311 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs @@ -91,7 +91,7 @@ namespace Orchard.DynamicForms.Drivers { protected override void OnDisplaying(TextArea element, ElementDisplayContext context) { context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData()); context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData()); - context.ElementShape.ProcessedValue = _tokenizer.Replace(element.RuntimeValue, context.GetTokenData()); + context.ElementShape.ProcessedValue = element.RuntimeValue; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs index 53390887f..7194a1f9b 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs @@ -78,8 +78,8 @@ namespace Orchard.DynamicForms.Drivers { protected override void OnDisplaying(TextField element, ElementDisplayContext context) { context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData()); - context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData()); - context.ElementShape.ProcessedValue = _tokenizer.Replace(element.RuntimeValue, context.GetTokenData()); + context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData(), new ReplaceOptions {Encoding = ReplaceOptions.NoEncode}); + context.ElementShape.ProcessedValue = element.RuntimeValue; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs index 7c121254d..2c8b97785 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs @@ -73,7 +73,7 @@ namespace Orchard.DynamicForms.Drivers { protected override void OnDisplaying(UrlField element, ElementDisplayContext context) { context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData()); context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData()); - context.ElementShape.ProcessedValue = _tokenizer.Replace(element.RuntimeValue, context.GetTokenData()); + context.ElementShape.ProcessedValue = element.RuntimeValue; } } } \ No newline at end of file