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

#20241, #20191: Fixing Decision Script

Browse Source 
- Boolean field what incorrectly updating values for drafts
- Decision script is now using #{ } token syntax by default
- ContentItem is used by custom forms

Work Items: 20241, 20191
This commit is contained in:
Sebastien Ros
2014-03-21 17:57:18 -07:00
parent eaa9ae1682
commit 24f9225361
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
View File

@@ -155,7 +155,7 @@ namespace Orchard.CustomForms.Controllers {
() => new Dictionary<string, object> { { "Content", contentItem } }); () => new Dictionary<string, object> { { "Content", contentItem } });
// trigger any workflow // trigger any workflow
_workflowManager.TriggerEvent(FormSubmittedActivity.EventName, customForm.ContentItem, _workflowManager.TriggerEvent(FormSubmittedActivity.EventName, contentItem,
() => new Dictionary<string, object> { { "Content", contentItem } }); () => new Dictionary<string, object> { { "Content", contentItem } });
if (customForm.Redirect) { if (customForm.Redirect) {

3
src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs
View File

@@ -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) { protected override void Importing(ContentPart part, BooleanField field, ImportContentContext context) {

3
src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Activities/DecisionActivity.cs
View File

@@ -46,6 +46,9 @@ namespace Orchard.Scripting.CSharp.Activities {
public override IEnumerable<LocalizedString> Execute(WorkflowContext workflowContext, ActivityContext activityContext) { public override IEnumerable<LocalizedString> Execute(WorkflowContext workflowContext, ActivityContext activityContext) {
var script = activityContext.GetState<string>("Script"); var script = activityContext.GetState<string>("Script");
script = "// #{ }" + System.Environment.NewLine;
object outcome = null; object outcome = null;
_csharpService.SetParameter("Services", _orchardServices); _csharpService.SetParameter("Services", _orchardServices);