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

Merge branch '1.9.x' into dev

Browse Source 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
	src/Orchard/Orchard.Framework.csproj
This commit is contained in:
Sebastien Ros
2015-06-30 11:35:41 -07:00
parent 4967fa807b 6b0985a44e
commit 1d6cb27d01
266 changed files with 941 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
View File

@@ -3,6 +3,7 @@ using Orchard.DynamicForms.Elements;
using Orchard.Forms.Services;
using Orchard.Layouts.Framework.Display;
using Orchard.Layouts.Framework.Drivers;
using Orchard.Layouts.Helpers;
using Orchard.Tokens;
using DescribeContext = Orchard.Forms.Services.DescribeContext;
@@ -40,7 +41,9 @@ namespace Orchard.DynamicForms.Drivers {
}
protected override void OnDisplaying(RadioButton element, ElementDisplayingContext context) {
context.ElementShape.TokenizedValue = _tokenizer.Replace(element.Value, null);
context.ElementShape.ProcessedName = _tokenizer.Replace(element.Name, context.GetTokenData());
context.ElementShape.ProcessedLabel = _tokenizer.Replace(element.Label, context.GetTokenData());
context.ElementShape.ProcessedValue = _tokenizer.Replace(element.Value, context.GetTokenData());
}
}
}