diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs index 2aa335797..8d8a43c43 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs @@ -155,7 +155,7 @@ namespace Orchard.CustomForms.Controllers { () => new Dictionary { { "Content", contentItem } }); // trigger any workflow - _workflowManager.TriggerEvent(FormSubmittedActivity.EventName, customForm.ContentItem, + _workflowManager.TriggerEvent(FormSubmittedActivity.EventName, contentItem, () => new Dictionary { { "Content", contentItem } }); if (customForm.Redirect) { diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs index 7b0de3e1b..4e0afb916 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs @@ -52,7 +52,8 @@ namespace Orchard.Fields.Drivers { } } - return Editor(part, field, shapeHelper); + return ContentShape("Fields_Boolean_Edit", GetDifferentiator(field, part), + () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: field, Prefix: GetPrefix(field, part))); } protected override void Importing(ContentPart part, BooleanField field, ImportContentContext context) { diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Activities/DecisionActivity.cs b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Activities/DecisionActivity.cs index 5335d23ed..febbe15b9 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Activities/DecisionActivity.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Activities/DecisionActivity.cs @@ -46,6 +46,9 @@ namespace Orchard.Scripting.CSharp.Activities { public override IEnumerable Execute(WorkflowContext workflowContext, ActivityContext activityContext) { var script = activityContext.GetState("Script"); + + script = "// #{ }" + System.Environment.NewLine; + object outcome = null; _csharpService.SetParameter("Services", _orchardServices);