From 044bb2fdaf73f4ce31c3f433e7d6e3dedef68fba Mon Sep 17 00:00:00 2001 From: Thierry Fleury Date: Sun, 29 Nov 2015 16:24:02 +0100 Subject: [PATCH 1/5] Fixes #4622 : ShapeTracingFactory Should Not be Activable without HttpContext --- .../Orchard.DesignerTools/Services/ShapeTracingFactory.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs index ae80ad879..b1b3c3a58 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ShapeTracingFactory.cs @@ -41,6 +41,10 @@ namespace Orchard.DesignerTools.Services { } private bool IsActivable() { + // don't activate if no HttpContext + if (_workContext.HttpContext == null) + return false; + // activate on front-end only if (AdminFilter.IsApplied(new RequestContext(_workContext.HttpContext, new RouteData()))) return false; From e1019b5fac19cbcf2eb65d590984d78183d157e6 Mon Sep 17 00:00:00 2001 From: mvarblow Date: Wed, 2 Dec 2015 11:34:47 -0500 Subject: [PATCH 2/5] Update UserActivity.cs Add missing activity, fixes #5684 in 1.9.x branch. --- .../Orchard.Users/Activities/UserActivity.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Users/Activities/UserActivity.cs b/src/Orchard.Web/Modules/Orchard.Users/Activities/UserActivity.cs index b9cf7bb46..01ff766ad 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Activities/UserActivity.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Activities/UserActivity.cs @@ -77,6 +77,17 @@ namespace Orchard.Users.Activities { } } + [OrchardFeature("Orchard.Users.Workflows")] + public class UserLogInFailedActivity : UserActivity { + public override string Name { + get { return "UserLogInFailed"; } + } + + public override LocalizedString Description { + get { return T("User login failed."); } + } + } + [OrchardFeature("Orchard.Users.Workflows")] public class UserLoggedOutActivity : UserActivity { public override string Name { @@ -142,4 +153,4 @@ namespace Orchard.Users.Activities { get { return T("User is approved."); } } } -} \ No newline at end of file +} From 66e08e5f419bcd7519bed08711892a5a6d207826 Mon Sep 17 00:00:00 2001 From: Gustavo Tandeciarz Date: Thu, 3 Dec 2015 14:23:37 -0500 Subject: [PATCH 3/5] Removing duplicate fields from content parts fails SingleOrDefault will throw an error when removing fields with the same name. Should be FirstOrDefault as it is on line 64 --- .../MetaData/Builders/ContentPartDefinitionBuilder.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs b/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs index 819680678..f2852d22e 100644 --- a/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs +++ b/src/Orchard/ContentManagement/MetaData/Builders/ContentPartDefinitionBuilder.cs @@ -43,7 +43,7 @@ namespace Orchard.ContentManagement.MetaData.Builders { } public ContentPartDefinitionBuilder RemoveField(string fieldName) { - var existingField = _fields.SingleOrDefault(x => x.Name == fieldName); + var existingField = _fields.FirstOrDefault(x => x.Name == fieldName); if (existingField != null) { _fields.Remove(existingField); } @@ -162,4 +162,4 @@ namespace Orchard.ContentManagement.MetaData.Builders { return obj; } } -} \ No newline at end of file +} From e29fb90298659a67b58711a64f0c23746817cb06 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 4 Dec 2015 00:18:27 +0100 Subject: [PATCH 4/5] 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 From 68b3fe56d05e45ef77c20f279c73ab22827c8b8c Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 4 Dec 2015 12:14:21 +0100 Subject: [PATCH 5/5] Updated various input elements using NoEncode. This prevents HTML characters from being encoded when using the tokenizer on element labels. --- .../Orchard.DynamicForms/Drivers/ButtonElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs | 4 ++-- .../Orchard.DynamicForms/Drivers/FieldsetElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/LabelElementDriver.cs | 2 +- .../Drivers/PasswordFieldElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/QueryElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/TaxonomyElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs | 2 +- .../Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs | 2 +- .../Orchard.DynamicForms/Helpers/TokenizerExtensions.cs | 4 ++-- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ButtonElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ButtonElementDriver.cs index 9d4e649b3..9ae4e1e25 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ButtonElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/ButtonElementDriver.cs @@ -38,7 +38,7 @@ namespace Orchard.DynamicForms.Drivers { protected override void OnDisplaying(Button element, ElementDisplayContext context) { context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData()); - context.ElementShape.ProcessedText = _tokenizer.Replace(element.Text, context.GetTokenData()); + context.ElementShape.ProcessedText = _tokenizer.Replace(element.Text, context.GetTokenData(), new ReplaceOptions {Encoding = ReplaceOptions.NoEncode}); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs index 983b6e6f7..5557fdd3e 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs @@ -67,7 +67,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.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData(), new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); context.ElementShape.ProcessedValue = _tokenizer.Replace(element.Value, context.GetTokenData()); } } diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs index 5bd7ce5a2..6c53ed807 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs @@ -78,7 +78,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.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData(), new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); context.ElementShape.ProcessedValue = element.RuntimeValue; } } diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs index cbc5f0b0d..61bcd1e26 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs @@ -84,8 +84,8 @@ namespace Orchard.DynamicForms.Drivers { var tokenData = context.GetTokenData(); context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, tokenData); - context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, tokenData); - context.ElementShape.ProcessedOptions = _tokenizer.Replace(element.Options, tokenData).ToArray(); + context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, tokenData, new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); + context.ElementShape.ProcessedOptions = _tokenizer.Replace(element.Options, tokenData, new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }).ToArray(); context.ElementShape.Metadata.Alternates.Add(String.Format("Elements_{0}__{1}", typeName, element.InputType)); context.ElementShape.Metadata.Alternates.Add(String.Format("Elements_{0}_{1}__{2}", typeName, displayType, element.InputType)); } diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/FieldsetElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/FieldsetElementDriver.cs index ad029c192..d8af7b3b2 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/FieldsetElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/FieldsetElementDriver.cs @@ -13,7 +13,7 @@ namespace Orchard.DynamicForms.Drivers { } protected override void OnDisplaying(Fieldset element, ElementDisplayContext context) { - context.ElementShape.ProcessedLegend = _tokenizer.Replace(element.Legend, context.GetTokenData()); + context.ElementShape.ProcessedLegend = _tokenizer.Replace(element.Legend, context.GetTokenData(), new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); } } } \ 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 6c1e3d7c1..83c8752be 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 = element.Value; + context.ElementShape.ProcessedValue = element.RuntimeValue; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/LabelElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/LabelElementDriver.cs index 242f6ffd4..174851d5d 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/LabelElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/LabelElementDriver.cs @@ -42,7 +42,7 @@ namespace Orchard.DynamicForms.Drivers { } protected override void OnDisplaying(Label element, ElementDisplayContext context) { - context.ElementShape.ProcessedText = _tokenizer.Replace(element.Text, context.GetTokenData()); + context.ElementShape.ProcessedText = _tokenizer.Replace(element.Text, context.GetTokenData(), new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); context.ElementShape.ProcessedFor = _tokenizer.Replace(element.For, context.GetTokenData()); } } diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/PasswordFieldElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/PasswordFieldElementDriver.cs index de020635f..57e39f9be 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/PasswordFieldElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/PasswordFieldElementDriver.cs @@ -75,7 +75,7 @@ namespace Orchard.DynamicForms.Drivers { protected override void OnDisplaying(PasswordField element, ElementDisplayContext context) { context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData()); - context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData()); + context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData(), new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/QueryElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/QueryElementDriver.cs index 112c554a1..7e59ce387 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/QueryElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/QueryElementDriver.cs @@ -149,7 +149,7 @@ namespace Orchard.DynamicForms.Drivers { foreach (var contentItem in contentItems) { var data = new {Content = contentItem}; var value = _tokenizer.Replace(valueExpression, data); - var text = _tokenizer.Replace(textExpression, data); + var text = _tokenizer.Replace(textExpression, data, new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); yield return new SelectListItem { Text = text, diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs index 75ec3e236..2c275d286 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs @@ -42,7 +42,7 @@ namespace Orchard.DynamicForms.Drivers { protected override void OnDisplaying(RadioButton element, ElementDisplayContext context) { context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData()); - context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData()); + context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData(), new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); context.ElementShape.ProcessedValue = _tokenizer.Replace(element.Value, context.GetTokenData()); } } diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyElementDriver.cs index 937a406ac..727289a74 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TaxonomyElementDriver.cs @@ -127,7 +127,7 @@ namespace Orchard.DynamicForms.Drivers { var tokenData = context.GetTokenData(); context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, tokenData); - context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, tokenData); + context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, tokenData, new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); context.ElementShape.TermOptions = GetTermOptions(element, context.DisplayType, taxonomyId, tokenData).ToArray(); context.ElementShape.Metadata.Alternates.Add(String.Format("Elements_{0}__{1}", typeName, element.InputType)); context.ElementShape.Metadata.Alternates.Add(String.Format("Elements_{0}_{1}__{2}", typeName, displayType, element.InputType)); diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs index 9fd251311..6dc9bbca3 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs @@ -90,7 +90,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.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData(), new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); context.ElementShape.ProcessedValue = element.RuntimeValue; } } diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs index 2c8b97785..a2cb7c333 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/UrlFieldElementDriver.cs @@ -72,7 +72,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.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData(), new ReplaceOptions { Encoding = ReplaceOptions.NoEncode }); context.ElementShape.ProcessedValue = element.RuntimeValue; } } diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/TokenizerExtensions.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/TokenizerExtensions.cs index 9c76c2f46..731ed5824 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/TokenizerExtensions.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Helpers/TokenizerExtensions.cs @@ -5,9 +5,9 @@ using Orchard.Tokens; namespace Orchard.DynamicForms.Helpers { public static class TokenizerExtensions { - public static IEnumerable Replace(this ITokenizer tokenizer, IEnumerable items, IDictionary data) { + public static IEnumerable Replace(this ITokenizer tokenizer, IEnumerable items, IDictionary data, ReplaceOptions options) { return items.Select(item => new SelectListItem { - Text = tokenizer.Replace(item.Text, data), + Text = tokenizer.Replace(item.Text, data, options), Value = item.Value, Disabled = item.Disabled, Group = item.Group,